| Message ID | 20201208204016.4eb18ca4@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 |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/merge (9acd775e4579bde0a6d937d72f9669e418aa87ad) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/next (250ad7a45b1e58d580decfb935fc063c4cf56f91) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linus/master (cd796ed3345030aa1bb332fe5c793b3dddaf56e7) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch powerpc/fixes (a1ee28117077c3bf24e5ab6324c835eaab629c45) |
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch linux-next (15ac8fdb74403772780be1a8c4f7c1eff1040fc4) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
Hi all, On Tue, 8 Dec 2020 20:40:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the akpm-current tree got conflicts in: > > drivers/misc/lkdtm/Makefile > drivers/misc/lkdtm/lkdtm.h > tools/testing/selftests/lkdtm/tests.txt > > between commit: > > 3ba150fb2120 ("lkdtm/powerpc: Add SLB multihit test") > > from the powerpc tree and commit: > > 014a486edd8a ("drivers/misc/lkdtm: add new file in LKDTM to test fortified strscpy") > > 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. > > > diff --cc drivers/misc/lkdtm/Makefile > index 5a92c74eca92,d898f7b22045..000000000000 > --- a/drivers/misc/lkdtm/Makefile > +++ b/drivers/misc/lkdtm/Makefile > @@@ -10,7 -10,7 +10,8 @@@ lkdtm-$(CONFIG_LKDTM) += rodata_objcop > lkdtm-$(CONFIG_LKDTM) += usercopy.o > lkdtm-$(CONFIG_LKDTM) += stackleak.o > lkdtm-$(CONFIG_LKDTM) += cfi.o > + lkdtm-$(CONFIG_LKDTM) += fortify.o > +lkdtm-$(CONFIG_PPC_BOOK3S_64) += powerpc.o > > KASAN_SANITIZE_stackleak.o := n > KCOV_INSTRUMENT_rodata.o := n > diff --cc drivers/misc/lkdtm/lkdtm.h > index 79ec05c18dd1,6aa6d6a1a839..000000000000 > --- a/drivers/misc/lkdtm/lkdtm.h > +++ b/drivers/misc/lkdtm/lkdtm.h > @@@ -102,7 -104,7 +104,10 @@@ void lkdtm_STACKLEAK_ERASING(void) > /* cfi.c */ > void lkdtm_CFI_FORWARD_PROTO(void); > > + /* fortify.c */ > + void lkdtm_FORTIFIED_STRSCPY(void); > + > +/* powerpc.c */ > +void lkdtm_PPC_SLB_MULTIHIT(void); > + > #endif > diff --cc tools/testing/selftests/lkdtm/tests.txt > index 18e4599863c0,92ba4cc41314..000000000000 > --- a/tools/testing/selftests/lkdtm/tests.txt > +++ b/tools/testing/selftests/lkdtm/tests.txt > @@@ -68,4 -68,4 +68,5 @@@ USERCOPY_STACK_BEYON > USERCOPY_KERNEL > STACKLEAK_ERASING OK: the rest of the thread stack is properly erased > CFI_FORWARD_PROTO > + FORTIFIED_STRSCPY > +PPC_SLB_MULTIHIT Recovered These conflicts are now between the powerpc tree and Linus' tree.
diff --cc drivers/misc/lkdtm/Makefile index 5a92c74eca92,d898f7b22045..000000000000 --- a/drivers/misc/lkdtm/Makefile diff --cc drivers/misc/lkdtm/lkdtm.h index 79ec05c18dd1,6aa6d6a1a839..000000000000 --- a/drivers/misc/lkdtm/lkdtm.h diff --cc tools/testing/selftests/lkdtm/tests.txt index 18e4599863c0,92ba4cc41314..000000000000 --- a/tools/testing/selftests/lkdtm/tests.txt
Hi all, Today's linux-next merge of the akpm-current tree got conflicts in: drivers/misc/lkdtm/Makefile drivers/misc/lkdtm/lkdtm.h tools/testing/selftests/lkdtm/tests.txt between commit: 3ba150fb2120 ("lkdtm/powerpc: Add SLB multihit test") from the powerpc tree and commit: 014a486edd8a ("drivers/misc/lkdtm: add new file in LKDTM to test fortified strscpy") 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.