Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/mach-s3c/Makefile
between commit:
608d67522f28 ("kbuild: remove --include-dir MAKEFLAG from top Makefile")
from the kbuild tree and commits:
61b7f8920b17 ("ARM: s3c: remove all s3c24xx support")
1ea35b355722 ("ARM: s3c: remove s3c24xx specific hacks")
from the arm-soc 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/arm/mach-s3c/Makefile
index deb44326b828,988c49672715..000000000000
--- a/arch/arm/mach-s3c/Makefile
+++ b/arch/arm/mach-s3c/Makefile
@@@ -2,13 -2,7 +2,7 @@@
#
# Copyright 2009 Simtec Electronics
- ifdef CONFIG_ARCH_S3C24XX
- include $(srctree)/$(src)/Makefile.s3c24xx
- endif
-
- ifdef CONFIG_ARCH_S3C64XX
-include $(src)/Makefile.s3c64xx
+include $(srctree)/$(src)/Makefile.s3c64xx
- endif
# Objects we always build independent of SoC choice
Attachment:
pgpLb229eRA8X.pgp
Description: OpenPGP digital signature
