Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 18 Jun 2021 19:44:55 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        PowerPC <linuxppc-dev@lists.ozlabs.org>
Cc:     Christophe Leroy <christophe.leroy@csgroup.eu>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Nicholas Piggin <npiggin@gmail.com>
Subject: linux-next: manual merge of the akpm-current tree with the powerpc
 tree
Message-ID: <20210618194455.0d6c278c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/M+Wq.F/4zU0/J14IKaaJLBi";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/M+Wq.F/4zU0/J14IKaaJLBi
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/powerpc/kernel/smp.c

between commit:

  86f46f343272 ("powerpc/32s: Initialise KUAP and KUEP in C")

from the powerpc tree and commit:

  103e676c91d0 ("lazy tlb: introduce lazy mm refcount helper functions")

from the akpm-current 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 arch/powerpc/kernel/smp.c
index b83a59ce9beb,b289f1d213f8..000000000000
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@@ -1541,11 -1541,7 +1541,11 @@@ void start_secondary(void *unused
  {
  	unsigned int cpu =3D raw_smp_processor_id();
 =20
 +	/* PPC64 calls setup_kup() in early_setup_secondary() */
 +	if (IS_ENABLED(CONFIG_PPC32))
 +		setup_kup();
 +
- 	mmgrab(&init_mm);
+ 	mmgrab_lazy_tlb(&init_mm);
  	current->active_mm =3D &init_mm;
 =20
  	smp_store_cpu_info(cpu);

--Sig_/M+Wq.F/4zU0/J14IKaaJLBi
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmDMaxcACgkQAVBC80lX
0GzLXwf8C7WvRhGnluquFmE4QTsgIa5BfVUijJRQokPBLJ36guAvonwimv3k5sIW
0wXj9QKboomPEoK2XAMuAqO4xj3Q0YWrwatlMb1fH11tZB4xJ011gGDVxtJM/Xsn
U114Jh+5ISE5a6zsoaHV4EsCOcDXgdvd+exXFoi2ulKL+YSFTGv9OA7S0iPbdJGk
PUkmAfYxrOLkAvC85J4XBrzhCCwcI4eQPrjtWq2/OP0d5so5uAT6MAkUjFQYT46G
1DGw9U9gGZT4F47uhX8oTrwzpJup2SWbA76WHbUJhdj99SEyN3K0stF4KtZL/BtH
7cOczdtZrkIV+JwdCT90v/gNqhS1PA==
=F/IL
-----END PGP SIGNATURE-----

--Sig_/M+Wq.F/4zU0/J14IKaaJLBi--