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 15:55:33 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Kees Cook <keescook@chromium.org>
Cc:     Andrei Vagin <avagin@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the mm tree with the execve tree
Message-ID: <20220914155533.70c10493@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/p._F.fVWJ=gm4OzKmoZmt6Y";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/p._F.fVWJ=gm4OzKmoZmt6Y
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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 vfor=
k+exec"")

from the execve tree and commit:

  33a2d6bc3480 ("Revert "fs/exec: allow to unshare a time namespace on vfor=
k+exec"")

from the mm tree.

I fixed it up (see below) 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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/exec.c
index 3f69e5c1a622,afe55d0c3bcf..000000000000
--- a/fs/exec.c
+++ b/fs/exec.c
@@@ -1023,9 -1029,12 +1026,9 @@@ static int exec_mmap(struct mm_struct *
  	activate_mm(active_mm, mm);
  	if (IS_ENABLED(CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM))
  		local_irq_enable();
- 	tsk->mm->vmacache_seqnum =3D 0;
- 	vmacache_flush(tsk);
  	task_unlock(tsk);
+ 	lru_gen_use_mm(mm);
+=20
 -	if (vfork)
 -		timens_on_fork(tsk->nsproxy, tsk);
 -
  	if (old_mm) {
  		mmap_read_unlock(old_mm);
  		BUG_ON(active_mm !=3D old_mm);

--Sig_/p._F.fVWJ=gm4OzKmoZmt6Y
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMhbNUACgkQAVBC80lX
0GzTAAf+JMjF0JAOaFmsc7XY38c81PJBCnKsganJrIS4B6tuqBRe34UTkF7flP4u
Ffd3E9tNRnKcovsczVcspnfhUagw7AevXy/xoZMZtmlxMkrDULUe7CftQSEhg09K
zLMxrxILtO+AVSyooche4131G/GtMItzUXLU7GnMtuMDMxMn1ZSUS8R/6FgXtxfv
GKh4EAT+ZEe+mg4uFRD0n1rwZwqetsk2MuHqM3rqxjY2GS0Ua4zUEFThc6Da6nID
2YXIa0mwfEiVsOsa6kRpQPJuTjjyFsokaRGTfcnoTPnUIM0Rk5ubMKsv438LogpV
LEIucL8uKGkSMxNsKr/mhwW2VddEow==
=DZx5
-----END PGP SIGNATURE-----

--Sig_/p._F.fVWJ=gm4OzKmoZmt6Y--