On Mon, Jul 09, 2012 at 11:50:46AM +0530, ABRAHAM, KISHON VIJAY wrote: > Hi Greg, > > On Fri, Jul 6, 2012 at 4:05 AM, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > On Mon, Jul 02, 2012 at 11:26:39AM +0300, Felipe Balbi wrote: > >> On Mon, Jul 02, 2012 at 11:22:00AM +0300, Felipe Balbi wrote: > >> > Hi Greg, > >> > > >> > here are the patches I queued for transceiver drivers. Let me know if > >> > you want me to change anything. > >> > >> this will conflict with your usb-next branch, here's the resolution > >> patch: > > > > Thanks for this, that helped out a lot. > > > > I also got a conflict in drivers/usb/otg/twl6030-usb.c, which I think I > > resolved properly, but it would be great if you could verify it. > > There is a mistake in the conflict resolution in file twl6030-usb.c > + otg->default_a = true; > + twl->phy.state = OTG_STATE_A_IDLE; > The above two lines shouldn't be there. I can send a patch for fixing > this if needed. Yes, please do, that will make it easier for me to ensure I got it correct this time. Thanks for checking. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
