On Fri, Dec 20, 2013 at 08:15:09AM +1100, Stephen Rothwell wrote: > Hi Felipe, > > On Thu, 19 Dec 2013 09:30:34 -0600 Felipe Balbi <balbi@xxxxxx> wrote: > > > > Actually, when I merged greg/usb-linus on top of my 'next', I got a > > conflict which was enough to solve as below: > > > > commit d86c94d1ddeb496cf53ace1a76274ebb1d935671 > > Merge: c139e14 fb5f183 > > Author: Felipe Balbi <balbi@xxxxxx> > > Date: Thu Dec 19 09:20:49 2013 -0600 > > > > Merge remote-tracking branch 'greg/usb-linus' into merge > > > > Signed-off-by: Felipe Balbi <balbi@xxxxxx> > > > > Conflicts: > > drivers/usb/phy/Kconfig > > > > diff --cc drivers/usb/phy/Kconfig > > index 54bebba3,2b41c63..3ab63b5 > > --- a/drivers/usb/phy/Kconfig > > +++ b/drivers/usb/phy/Kconfig > > @@@ -6,14 -6,6 +6,15 @@@ menu "USB Physical Layer drivers > > config USB_PHY > > def_bool n > > > > +config USB_OTG_FSM > > - bool "USB 2.0 OTG FSM implementation" > > ++ tristate "USB 2.0 OTG FSM implementation" > > + select USB_OTG > > + select USB_PHY > > ++ depends on USB > > + help > > + Implements OTG Final State Machine as specified in On-The-Go > > + and Embedded Host Supplement to the USB Revision 2.0 Specification. > > + > > # > > # USB Transceiver Drivers > > # > > > > This will make sure we have no bisection point where the build error > > would still exist. I can merge Linus' -rc5 once it's out in my 'next' > > branch and solve all problems at once. > > I have added that to my merge resolution for today. > > Thanks for tracking this down. no problem ;-) -- balbi
Attachment:
signature.asc
Description: Digital signature
