Messages in this thread | | | Date | Fri, 5 Dec 2014 14:17:17 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the kbuild tree with the arm-soc tree |
| |
Hi Michal,
Today's linux-next merge of the kbuild tree got a conflict in scripts/Kbuild.include between commit 9fb5e5372208 ("dts, kbuild: Factor out dtbs install rules to Makefile.dtbinst") from the arm-soc tree and commit 1846dfbde3e8 ("kbuild: remove redundant -rR flag of hdr-inst") from the kbuild tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc scripts/Kbuild.include index 5374b1bdf02f,353dcf09dd18..000000000000 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@@ -180,11 -180,17 +180,23 @@@ build := -f $(srctree)/scripts/Makefile modbuiltin := -f $(srctree)/scripts/Makefile.modbuiltin obj ### +# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.dtbinst obj= +# Usage: +# $(Q)$(MAKE) $(dtbinst)=dir +dtbinst := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.dtbinst obj + ++### + # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj= + # Usage: + # $(Q)$(MAKE) $(clean)=dir + clean := -f $(srctree)/scripts/Makefile.clean obj + + ### + # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.headersinst obj= + # Usage: + # $(Q)$(MAKE) $(hdr-inst)=dir + hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj + # Prefix -I with $(srctree) if it is not an absolute path. # skip if -I has no parameter addtree = $(if $(patsubst -I%,%,$(1)), \ [unhandled content-type:application/pgp-signature] | |