linux-next: manual merge of the 4xx tree with the powerpc tree

2011-12-08 Thread Stephen Rothwell
Hi Josh, Today's linux-next merge of the 4xx tree got a conflict in arch/powerpc/platforms/40x/ppc40x_simple.c between commit 11eab297f57b (powerpc: Add support for OpenBlockS 600) from the powerpc tree and commit d5b9ee7b514e (powerpc/40x: Add APM8018X SOC support) from the 4xx tree. I fixed it

Re: linux-next: manual merge of the 4xx tree with the powerpc tree

2011-12-08 Thread Josh Boyer
On Thu, Dec 8, 2011 at 8:38 PM, Stephen Rothwell s...@canb.auug.org.au wrote: Hi Josh, Today's linux-next merge of the 4xx tree got a conflict in arch/powerpc/platforms/40x/ppc40x_simple.c between commit 11eab297f57b (powerpc: Add support for OpenBlockS 600) from the powerpc tree and commit

Re: linux-next: manual merge of the 4xx tree with the powerpc tree

2011-12-08 Thread Stephen Rothwell
Hi Josh, On Thu, 8 Dec 2011 20:46:39 -0500 Josh Boyer jwbo...@gmail.com wrote: I blame BenH. I sent him a pull request with d5b9ee7b514e in it before he went and updated his tree. Still not pulled afaik. Guess I'll be rebasing my next branch tomorrow to pick up a series from Tony Breeds,

Re: linux-next: manual merge of the 4xx tree with the powerpc tree

2011-12-08 Thread Benjamin Herrenschmidt
On Thu, 2011-12-08 at 20:46 -0500, Josh Boyer wrote: On Thu, Dec 8, 2011 at 8:38 PM, Stephen Rothwell s...@canb.auug.org.au wrote: Hi Josh, Today's linux-next merge of the 4xx tree got a conflict in arch/powerpc/platforms/40x/ppc40x_simple.c between commit 11eab297f57b (powerpc: Add