lkml.org 
[lkml]   [2012]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the arm-soc tree with the staging tree
Date
On Wednesday 16 May 2012, Greg KH wrote:
> On Wed, May 16, 2012 at 01:03:34PM +0000, Arnd Bergmann wrote:
> > The staging tree version adds contents to at91sam9g20.dtsi, and the context
> > gets moved to at91sam9260.dtsi in arm-soc. If we want to resolve it now,
> > I think the best way is to add the change to at91sam9260.dtsi in arm-soc
> > and let you drop that part in staging. There are no hard dependencies
> > since this is new code and it the driver is still correct without the
> > change, it simply won't find the device.
>
> Ok, so if we leave it as-is for now, we can resolve it after 3.5-rc1 is
> out and we see what branch ended up "winning"? :)

Yes, works for me.

Arnd


\
 
 \ /
  Last update: 2012-05-16 16:21    [W:1.613 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site