| Message ID | 20210618194455.0d6c278c@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the akpm-current tree with the powerpc tree | expand |
| Related | show |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/merge (77fe1f3ccbe0cdc6f386aef522b043c52196d4d2) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/next (07d8ad6fd8a3d47f50595ca4826f41dbf4f3a0c6) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linus/master (fd0aa1a4567d0f09e1bfe367a950b004f99ac290) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/fixes (478036c4cd1a16e613a2f883d79c03cf187faacb) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linux-next (70585216fe7730d9fb5453d3e2804e149d0fe201) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
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); >
diff --cc arch/powerpc/kernel/smp.c index b83a59ce9beb,b289f1d213f8..000000000000 --- a/arch/powerpc/kernel/smp.c
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.