linux-next: manual merge of the 4xx tree

[Josh Boyer]

On Tue, 25 Nov 2008 11:50:21 +1100
Stephen Rothwell <sfr at canb.auug.org.au> 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 the powerpc-merge tree and commit
> 867b71f3da64eb917c23cfd8babcd1c4fc0ba7fd ("powerpc/44x: update
> ppc44x_defconfig") from the 4xx tree.

Sigh.

> I fixed it up (by setting CONFIG_GPIO_XILINX to y as is done in the
> former).  I can carry this fix until either your tree is merged by Paul or
> you do a merge against the powerpc-merge tree (or Linus' tree after he
> takes Paul's tree).

I tend to rebase my next branch off of Paul's next branch, so if he
updates his tomorrow I can just do that and we will all be happy.  If
that isn't done by my afternoon time, I'll fix it up myself.  There's
no reason you should have to carry an extra patch.  linux-next is hard
enough :)

josh