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

[Stephen Rothwell]

Hi Andrew,

[Readded cc's]

On Tue, 13 Sep 2022 23:03:02 -0700 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Wed, 14 Sep 2022 15:55:33 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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

Attachment: pgp067MguSzjy.pgp
Description: OpenPGP digital signature