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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130603104541.ba697d4df0ac27a363bb05b7@canb.auug.org.au>
Date:	Mon, 3 Jun 2013 10:45:41 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ian Campbell <ian.campbell@...rix.com>,
	Matthijs Kooijman <matthijs@...in.nl>,
	Michal Marek <mmarek@...e.cz>
Subject: linux-next: manual merge of the devicetree-current tree with the
 kbuild-current tree

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@...b.auug.org.au

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)

Content of type "application/pgp-signature" skipped