Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/boot/Makefile between commit: 7f7f6f7ad654 ("Makefile: remove redundant tool coverage variables") from the kbuild tree and commit: dd0716c2b877 ("x86/boot: Add a fallthrough annotation") from the tip 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. -- Cheers, Stephen Rothwell diff --cc arch/x86/boot/Makefile index 1cf24ff6acac,343aef6d752f..000000000000 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@@ -56,6 -69,9 +56,7 @@@ KBUILD_CFLAGS := $(REALMODE_CFLAGS) -D_ KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=) KBUILD_CFLAGS += -fno-asynchronous-unwind-tables + KBUILD_CFLAGS += $(CONFIG_CC_IMPLICIT_FALLTHROUGH) -GCOV_PROFILE := n -UBSAN_SANITIZE := n $(obj)/bzImage: asflags-y := $(SVGA_MODE)
Attachment:
pgpgRQHvqb42D.pgp
Description: OpenPGP digital signature