linux-kernel - linux-next: manual merge of the devicetree tree with the microblaze 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Tue, 27 Jul 2010 13:17:40 +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,
	Jonas Bonn <jonas@...thpole.se>,
	"Steven J. Magnani" <steve@...idescorp.com>,
	Michal Simek <michal.simek@...alogix.com>
Subject: linux-next: manual merge of the devicetree tree with the microblaze
 tree

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
arch/microblaze/kernel/Makefile between commit
117aa948321f3b019d9d8160591dc8256a6035cd ("microblaze: Add stack
unwinder") from the microblaze tree and commit
c0dd394ca5e78649b7013c3ce2d6338af9f228f0 ("of: remove
of_default_bus_ids") from the devicetree tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/microblaze/kernel/Makefile
index d66ddef,7fcc5f7..0000000
--- a/arch/microblaze/kernel/Makefile
+++ b/arch/microblaze/kernel/Makefile
@@@ -15,9 -15,9 +15,9 @@@ endi
  extra-y := head.o vmlinux.lds
  
  obj-y += dma.o exceptions.o \
- 	hw_exception_handler.o init_task.o intc.o irq.o of_device.o \
- 	of_platform.o process.o prom.o prom_parse.o ptrace.o \
+ 	hw_exception_handler.o init_task.o intc.o irq.o \
+ 	process.o prom.o prom_parse.o ptrace.o \
 -	setup.o signal.o sys_microblaze.o timer.o traps.o reset.o
 +	reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
  
  obj-y += cpu/
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/