On Thu, 2011-12-08 at 20:46 -0500, Josh Boyer wrote:
> On Thu, Dec 8, 2011 at 8:38 PM, Stephen Rothwell
> 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 fo
Hi Josh,
On Thu, 8 Dec 2011 20:46:39 -0500 Josh Boyer 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, unless Ben ha
On Thu, Dec 8, 2011 at 8:38 PM, Stephen Rothwell 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 d5b9ee7b514e (
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
On Tue, 25 Nov 2008 11:50:21 +1100
Stephen Rothwell <[EMAIL PROTECTED]> wrote:
> Hi Josh,
>
> Today's linux-next merge of the 4xx tree got a conflict in
> arch/powerpc/configs/ppc44x_defconfig between commit
> c8d698849e135780738c2cb08f07f06eda982a8c ("powerpc/virtex: Update
> defconfigs") from t
Hi Josh,
Today's linux-next merge of the 4xx tree got a conflict in
arch/powerpc/configs/ppc44x_defconfig between commit
c8d698849e135780738c2cb08f07f06eda982a8c ("powerpc/virtex: Update
defconfigs") from the powerpc-merge tree and commit
867b71f3da64eb917c23cfd8babcd1c4fc0ba7fd ("powerpc/44x: upd
