[GIT PULL] pxa: patches for next merge window

[Stephen Rothwell]

Hi Uwe,

On Mon, 1 Mar 2010 11:27:27 +0100 Uwe Kleine-König <u.kleine-koenig at pengutronix.de> wrote:
>
> > Out of the non-PXA merge requests, the only conflicts seem to be on
> > Kconfig/Makefile bits as usual, being fairly insular beyond that. While
> > these are fairly easy to sort out,
> Only a nice hint to whoever will merge the different arm trees in the
> end: Note that next is (or recently was) broken, because git merged two
> arm trees successfully (i.e. didn't result in a conflict) according to
> Stephen and broke arch/arm/Kconfig with it.  See
> 
> 	http://thread.gmane.org/gmane.linux.ports.arm.kernel/75250
> 
> for the exact details.
> 
> (I don't know if Stephen reports these issues to Linus anyhow, so this
> mail might have been sent for nothing.)

Thanks for that, I had not pointed that one out to Linus, yet.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100302/82ccbada/attachment.sig>