Excerpts from Stephen Rothwell's message of June 18, 2021 7:44 pm: > 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. This is the correct merge. Thanks, Nick > > -- > 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 = raw_smp_processor_id(); > > + /* 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 = &init_mm; > > smp_store_cpu_info(cpu); >