Re: [PATCH v7 00/11] usb: musb: adding multi instance support

[Koen Kooi <koen@xxxxxxxxxxxxxxxxxxxxx>]

Op 3 aug. 2012, om 17:48 heeft "Hiremath, Vaibhav" <hvaibhav@xxxxxx> het volgende geschreven:

> On Fri, Aug 03, 2012 at 17:11:38, Daniel Mack wrote:
>> On 03.08.2012 11:07, Hiremath, Vaibhav wrote:
>>> I have just pushed the code (V7 which Ravi submitted), so can you please try 
>>> with below branch? 
>>> 
>>> https://github.com/hvaibhav/am335x-linux/tree/am335x-upstream-staging-usb
>> 
>> Thanks for doing this, but I'm unfortunately getting tons of merge
>> conflicts when I try to put this on top of 3.6-rc1. Still pondering
>> which way around is the easiest to get this solved.
>> 
>> OTOH, I wonder whether your staging branches would need to rebased
>> sooner or later anyway?
>> 
> 
> I have already pushed branch based on v3.6-rc1 (boot tested),
> 
> https://github.com/hvaibhav/am335x-linux/tree/am335x-linux-next-master

I think Daniel meant without the linux-next stuff in between. E.g. on top of the v3.6-rc1 tag. I can see that such a tree is not of much use for you, since you now need to target the 3.7 merge window for new patches. But I can't and won't speak for both of you :)

regards,

Koen--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html