Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 14 Sep 2022 16:20:59 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Kees Cook <keescook@chromium.org>, Andrei Vagin <avagin@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the mm tree with the execve tree
Message-ID: <20220914162059.731b0461@canb.auug.org.au>
In-Reply-To: <20220913230302.00a8c826a2d4ae9a6ef2a90d@linux-foundation.org>
References: <20220914155533.70c10493@canb.auug.org.au>
        <20220913230302.00a8c826a2d4ae9a6ef2a90d@linux-foundation.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/KPkTiEwoE0n1ic_=ht096hX";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/KPkTiEwoE0n1ic_=ht096hX
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Andrew,

[Readded cc's]

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

--=20
Cheers,
Stephen Rothwell

--Sig_/KPkTiEwoE0n1ic_=ht096hX
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMhcssACgkQAVBC80lX
0GxMuAf+IX2p+j/qM0JF0IUR1G5vup6LlgQnsoaagfGVym3hC2J+cSTU162bXmkG
rY7DCgjM3AiQFCCFTQnpPR0wflIlW8iMvooL6NdD95CHD2KXY5L4K63eeoxeQOmb
Vf0m2gTtGEbusc+4L+yjApZcIytydOcjATkr8COT9aop7anAVlZu1sukWXotWnqz
6pl2//YbqDjWzjin7ct2ThWOfgVzW7KihMSh55GekATH6aP87aoGhUeVHpyj3oC2
2b7U/SUS95R/0kRDAnBIJOR/oxoeRLAwZpZmFXB5nVZi5foEFdT7pZt1Fo55KUZN
91D+NzFGFhOTvmSyMzfGwfnkNxTMxA==
=JaIK
-----END PGP SIGNATURE-----

--Sig_/KPkTiEwoE0n1ic_=ht096hX--