Re: linux-next: manual merge of the akpm-current tree with the arm64 tree
From: Stephen Rothwell <hidden>
Date: 2018-08-16 00:11:42
Also in:
lkml
Hi all, On Fri, 27 Jul 2018 20:55:32 +1000 Stephen Rothwell [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Today's linux-next merge of the akpm-current tree got a conflict in: drivers/firmware/efi/libstub/Makefile between commit: 0b3e336601b8 ("arm64: Add support for STACKLEAK gcc plugin") from the arm64 tree and commit: 08cc64a7109b ("module: allow symbol exports to be disabled") 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. -- Cheers, Stephen Rothwell diff --cc drivers/firmware/efi/libstub/Makefile index 25dd2a14560d,0d0d3483241c..000000000000--- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile@@@ -21,7 -21,7 +21,8 @@@ KBUILD_CFLAGS := $(cflags-y) -DDISABL -D__NO_FORTIFY \ $(call cc-option,-ffreestanding) \ $(call cc-option,-fno-stack-protector) \ - $(DISABLE_STACKLEAK_PLUGIN) ++ $(DISABLE_STACKLEAK_PLUGIN) \ + -D__DISABLE_EXPORTS GCOV_PROFILE := n KASAN_SANITIZE := n
This is now a conflict between Linus' tree and the akpm-current tree. -- Cheers, Stephen Rothwell
Attachments
- (unnamed) [application/pgp-signature] 488 bytes