linux-next: manual merge of the devicetree-current tree with thekbuild-current tree

[Stephen Rothwell]

Hi Grant,

Today's linux-next merge of the devicetree-current tree got a conflict in scripts/Makefile.lib between commit ad06156876c0 ("kbuild: Don't assume dts files live in arch/*/boot/dts") from the  tree and commit 2c302eb0a6a5 ("kbuild: make sure we clean up DTB temporary files") from the devicetree-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc scripts/Makefile.lib
index 8337663,d7ec7cf..0000000
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@@ -264,9 -264,9 +264,9 @@@ $(obj)/%.dtb.S: $(obj)/%.dt
  quiet_cmd_dtc = DTC     $@
  cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
  	$(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \
 -		-i $(srctree)/arch/$(SRCARCH)/boot/dts $(DTC_FLAGS) \
 +		-i $(dir $<) $(DTC_FLAGS) \
- 		-d $(depfile).dtc $(dtc-tmp) ; \
- 	cat $(depfile).pre $(depfile).dtc > $(depfile)
+ 		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
+ 	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
  
  $(obj)/%.dtb: $(src)/%.dts FORCE
  	$(call if_changed_dep,dtc)

Attachment: pgp00000.pgp
Description: PGP signature