linux-kernel - Re: linux-next: manual merge of the mm tree with the execve tree

lists.openwall.net		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 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Wed, 14 Sep 2022 16:20:59 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     Kees Cook <keescook@...omium.org>, Andrei Vagin <avagin@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the mm tree with the execve tree

Hi Andrew,

[Readded cc's]

On Tue, 13 Sep 2022 23:03:02 -0700 Andrew Morton <akpm@...ux-foundation.org> wrote:
>
> On Wed, 14 Sep 2022 15:55:33 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> > Today's linux-next merge of the mm tree got a conflict in:
> > 
> >   fs/exec.c
> > 
> > between commit:
> > 
> >   33a2d6bc3480 ("Revert "fs/exec: allow to unshare a time namespace on vfork+exec"")
> > 
> > from the execve tree and commit:
> > 
> >   33a2d6bc3480 ("Revert "fs/exec: allow to unshare a time namespace on vfork+exec"")
> > 
> > from the mm tree.  
> 
> Confused.  They're the same commit?

Sorry about that (still getting used to copy/paste in a VM on a Mac :-()

The latter one should have been:

  65d31cfbc445 ("mm: multi-gen LRU: support page table walks")

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped