Hi all, On Mon, 13 May 2024 15:13:16 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Today's linux-next merge of the kspp tree got a conflict in: > > drivers/misc/lkdtm/Makefile > > between commit: > > 9cf51a6d1de0 ("Makefile: remove redundant tool coverage variables") > > from the kbuild tree and commit: > > fb28a8862dc4 ("lkdtm: Disable CFI checking for perms functions") > > from the kspp 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 33fe61152a15,b28701138b4b..000000000000 > --- a/drivers/misc/lkdtm/Makefile > +++ b/drivers/misc/lkdtm/Makefile > @@@ -15,7 -15,11 +15,7 @@@ lkdtm-$(CONFIG_PPC_64S_HASH_MMU) += pow > > KASAN_SANITIZE_stackleak.o := n > > - CFLAGS_REMOVE_rodata.o += $(CC_FLAGS_LTO) $(RETHUNK_CFLAGS) > -KASAN_SANITIZE_rodata.o := n > -KCSAN_SANITIZE_rodata.o := n > -KCOV_INSTRUMENT_rodata.o := n > -OBJECT_FILES_NON_STANDARD_rodata.o := y > + CFLAGS_REMOVE_rodata.o += $(CC_FLAGS_LTO) $(RETHUNK_CFLAGS) $(CC_FLAGS_CFI) > > OBJCOPYFLAGS := > OBJCOPYFLAGS_rodata_objcopy.o := \ This is now a conflict between the kbuild tree and Linus' tree. -- Cheers, Stephen Rothwell
Attachment:
pgpIIArcH_8YS.pgp
Description: OpenPGP digital signature