Hi all, Today's linux-next merge of the crypto tree got a conflict in: arch/x86/purgatory/Makefile between commit: 4ce97317f41d ("x86/purgatory: Do not use __builtin_memcpy and __builtin_memset") from Linus' tree and commit: ad767ee858b3 ("crypto: sha256 - Move lib/sha256.c to lib/crypto") from the crypto 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/purgatory/Makefile index 8901a1f89cf5,ea86982aba27..000000000000 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@@ -6,12 -6,11 +6,14 @@@ purgatory-y := purgatory.o stack.o setu targets += $(purgatory-y) PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) +$(obj)/string.o: $(srctree)/arch/x86/boot/compressed/string.c FORCE + $(call if_changed_rule,cc_o_c) + - $(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE + $(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE $(call if_changed_rule,cc_o_c) + CFLAGS_sha256.o := -D__DISABLE_EXPORTS + LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib targets += purgatory.ro
Attachment:
pgpVQIjQ9MT5u.pgp
Description: OpenPGP digital signature