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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
