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:   Sat, 19 Jun 2021 12:54:50 +1000
From:   Nicholas Piggin <npiggin@gmail.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 powerpc tree
To:     Andrew Morton <akpm@linux-foundation.org>,
        PowerPC <linuxppc-dev@lists.ozlabs.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Christophe Leroy <christophe.leroy@csgroup.eu>,
        Linux Kernel =?iso-8859-1?q?Mailing=0A?= List 
        <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20210618194455.0d6c278c@canb.auug.org.au>
In-Reply-To: <20210618194455.0d6c278c@canb.auug.org.au>
MIME-Version: 1.0
Message-Id: <1624071243.qkc40fnx8l.astroid@bobo.none>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Excerpts from Stephen Rothwell's message of June 18, 2021 7:44 pm:
> Hi all,
>=20
> Today's linux-next merge of the akpm-current tree got a conflict in:
>=20
>   arch/powerpc/kernel/smp.c
>=20
> between commit:
>=20
>   86f46f343272 ("powerpc/32s: Initialise KUAP and KUEP in C")
>=20
> from the powerpc tree and commit:
>=20
>   103e676c91d0 ("lazy tlb: introduce lazy mm refcount helper functions")
>=20
> from the akpm-current tree.
>=20
> 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.

This is the correct merge.

Thanks,
Nick

>=20
> --=20
> Cheers,
> Stephen Rothwell
>=20
> 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);
>=20