lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Thu, 11 Oct 2018 19:18:55 -0700
From:   Kees Cook <>
To:     Ingo Molnar <>
Cc:     Stephen Rothwell <>,
        Thomas Gleixner <>,
        "H. Peter Anvin" <>,
        Peter Zijlstra <>,
        Linux-Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Arnd Bergmann <>
Subject: Re: linux-next: manual merge of the tip tree with Linus' tree

On Thu, Oct 11, 2018 at 7:14 PM, Stephen Rothwell <> wrote:
> Hi all,
> Today's linux-next merge of the tip tree got a conflict in:
>   arch/x86/mm/pgtable.c
> between commit:
>   184d47f0fd36 ("x86/mm: Avoid VLA in pgd_alloc()")
> from Linus' tree and commit:
>   1be3f247c288 ("x86/mm: Avoid VLA in pgd_alloc()")
> from the tip tree.
> I fixed it up (I used the version from Linus' tree) and can carry the
> fix as necessary. This is now fixed as far as linux-next is concerned,
> but any non trivial conflicts should be mentioned to your upstream
> maintainer when your tree is submitted for merging.  You may also want
> to consider cooperating with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts.

Ingo, it looks like that commit needs to be split up again ... Linus's
tree still needs the fix for the fix?


> --
> Cheers,
> Stephen Rothwell

Kees Cook
Pixel Security

Powered by blists - more mailing lists