Felipe Balbi wrote: > On Thu, Mar 25, 2010 at 01:34:25PM +0100, ext Gadiyar, Anand wrote: > >Felipe Balbi wrote: > >> > >> From: Sergei Shtylyov <[email protected]> > >> > >> musb_platform_exit() is called twice from musb_init_controller() iff > >> controller > >> initialization fails. Move the call (and the DevCtl register writes > >> surrounding > >> it) from musb_free() to musb_remove(). > >> > >> Fix mispalced and now incorrect 'goto's in musb_init_controller(). > >> > >> Signed-off-by: Sergei Shtylyov <[email protected]> > >> Signed-off-by: Felipe Balbi <[email protected]> > > > >This one doesn't apply for me. I'm on commit 01e7770 plus > >gregkh-07-usb-2.6.34-rc1.patch. The first 9 patches apply correctly, > >but this one fails on hunk 4 of 6. > > > >Felipe - are we on the same base here? > > > >Looking at gregkh-07-usb-2.6.34-rc1.patch, this hunk is already taken care > >of there. > > I'm on today's Linus' tree. Greg's queue doesn't apply there. I tried > v2.6.33, v2.6.34-rc1 and v2.6.34-rc2 tags also and couldn't get all > patches to apply.
This is probably a bad idea because Greg's queue currently has patches that touch the same files. That's a sure way to cause a conflict. Also, Greg's queue cleanly applies on current Linus' tree for me. Not sure why you're having trouble applying his queue. - Anand -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
