Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Jan 20, 2021 at 01:06:03PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/gadget/udc/bdc/Kconfig > > between commit: > > ef02684c4e67 ("usb: bdc: Make bdc pci driver depend on BROKEN") > > from the

linux-next: manual merge of the usb tree with the usb.current tree

Hi all, Today's linux-next merge of the usb tree got a conflict in: drivers/usb/gadget/udc/bdc/Kconfig between commit: ef02684c4e67 ("usb: bdc: Make bdc pci driver depend on BROKEN") from the usb.current tree and commit: 7766cafea0ec ("usb: bdc: Remove the BDC PCI driver") from the

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Jan 06, 2021 at 11:50:14AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/dwc3/gadget.c > > between commit: > > a1383b3537a7 ("usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup") > > from the

linux-next: manual merge of the usb tree with the usb.current tree

Hi all, Today's linux-next merge of the usb tree got a conflict in: drivers/usb/dwc3/gadget.c between commit: a1383b3537a7 ("usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup") from the usb.current tree and commit: 77adb8bdf422 ("usb: dwc3: gadget: Allow runtime suspend if

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Fri, Jun 26, 2020 at 01:29:10PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/cdns3/ep0.c > > between commit: > > c0e2a0341cd8 ("usb: cdns3: ep0: fix the test mode set incorrectly") > > from the usb.current tree

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Fri, Jun 26, 2020 at 01:29:10PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/cdns3/ep0.c > > between commit: > > c0e2a0341cd8 ("usb: cdns3: ep0: fix the test mode set incorrectly") > > from the usb.current tree

linux-next: manual merge of the usb tree with the usb.current tree

Hi all, Today's linux-next merge of the usb tree got a conflict in: drivers/usb/cdns3/ep0.c between commit: c0e2a0341cd8 ("usb: cdns3: ep0: fix the test mode set incorrectly") from the usb.current tree and commit: 62fb45d317c5 ("USB: ch9: add "USB_" prefix in front of TEST defines")

Re: linux-next: manual merge of the usb tree with the usb.current tree

On 07/01/18 01:43, Greg KH wrote: > On Fri, Jun 29, 2018 at 02:57:19PM +1000, Stephen Rothwell wrote: >> Hi Greg, >> >> Today's linux-next merge of the usb tree got a conflict in: >> >> drivers/staging/typec/Kconfig >> >> between commit: >> >> e16711c32bca ("staging/typec: fix tcpci_rt1711h

Re: linux-next: manual merge of the usb tree with the usb.current tree

On 07/01/18 01:43, Greg KH wrote: > On Fri, Jun 29, 2018 at 02:57:19PM +1000, Stephen Rothwell wrote: >> Hi Greg, >> >> Today's linux-next merge of the usb tree got a conflict in: >> >> drivers/staging/typec/Kconfig >> >> between commit: >> >> e16711c32bca ("staging/typec: fix tcpci_rt1711h

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Fri, Jun 29, 2018 at 02:57:19PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/staging/typec/Kconfig > > between commit: > > e16711c32bca ("staging/typec: fix tcpci_rt1711h build errors") > > from the usb.current

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Fri, Jun 29, 2018 at 02:57:19PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/staging/typec/Kconfig > > between commit: > > e16711c32bca ("staging/typec: fix tcpci_rt1711h build errors") > > from the usb.current

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in: drivers/staging/typec/Kconfig between commit: e16711c32bca ("staging/typec: fix tcpci_rt1711h build errors") from the usb.current tree and commit: 990da41530b3 ("staging: typec: tcpci: move tcpci drivers out of

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in: drivers/staging/typec/Kconfig between commit: e16711c32bca ("staging/typec: fix tcpci_rt1711h build errors") from the usb.current tree and commit: 990da41530b3 ("staging: typec: tcpci: move tcpci drivers out of

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Mon, Apr 30, 2018 at 01:55:05PM +0200, Sebastian Reichel wrote: > Hi, > > On Mon, Apr 30, 2018 at 11:34:10AM +1000, Stephen Rothwell wrote: > > Hi all, > > > > On Mon, 23 Apr 2018 13:04:44 +1000 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Mon, Apr 30, 2018 at 01:55:05PM +0200, Sebastian Reichel wrote: > Hi, > > On Mon, Apr 30, 2018 at 11:34:10AM +1000, Stephen Rothwell wrote: > > Hi all, > > > > On Mon, 23 Apr 2018 13:04:44 +1000 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the usb tree got a conflict

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Mon, Apr 30, 2018 at 11:34:10AM +1000, Stephen Rothwell wrote: > Hi all, > > On Mon, 23 Apr 2018 13:04:44 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the usb tree got a conflict in: > > > > drivers/usb/core/hcd.c > > > > between commit: > >

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Mon, Apr 30, 2018 at 11:34:10AM +1000, Stephen Rothwell wrote: > Hi all, > > On Mon, 23 Apr 2018 13:04:44 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the usb tree got a conflict in: > > > > drivers/usb/core/hcd.c > > > > between commit: > > > > 63cb03f5c11e

Re: linux-next: manual merge of the usb tree with the usb.current tree

Hi, On Mon, Apr 30, 2018 at 11:34:10AM +1000, Stephen Rothwell wrote: > Hi all, > > On Mon, 23 Apr 2018 13:04:44 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the usb tree got a conflict in: > > > > drivers/usb/core/hcd.c > > > > between commit:

Re: linux-next: manual merge of the usb tree with the usb.current tree

Hi, On Mon, Apr 30, 2018 at 11:34:10AM +1000, Stephen Rothwell wrote: > Hi all, > > On Mon, 23 Apr 2018 13:04:44 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the usb tree got a conflict in: > > > > drivers/usb/core/hcd.c > > > > between commit: > > > >

Re: linux-next: manual merge of the usb tree with the usb.current tree

Hi all, On Mon, 23 Apr 2018 13:04:44 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/core/hcd.c > > between commit: > > 63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}") > > from the

Re: linux-next: manual merge of the usb tree with the usb.current tree

Hi all, On Mon, 23 Apr 2018 13:04:44 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/core/hcd.c > > between commit: > > 63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}") > > from the usb.current tree and commit:

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Mon, Apr 23, 2018 at 10:30:11AM +0200, Johan Hovold wrote: > On Mon, Apr 23, 2018 at 01:04:44PM +1000, Stephen Rothwell wrote: > > Hi Greg, > > > > Today's linux-next merge of the usb tree got a conflict in: > > > > drivers/usb/core/hcd.c > > > > between commit: > > > > 63cb03f5c11e

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Mon, Apr 23, 2018 at 10:30:11AM +0200, Johan Hovold wrote: > On Mon, Apr 23, 2018 at 01:04:44PM +1000, Stephen Rothwell wrote: > > Hi Greg, > > > > Today's linux-next merge of the usb tree got a conflict in: > > > > drivers/usb/core/hcd.c > > > > between commit: > > > > 63cb03f5c11e

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Mon, Apr 23, 2018 at 01:04:44PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/core/hcd.c > > between commit: > > 63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}") > > from the usb.current tree and

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Mon, Apr 23, 2018 at 01:04:44PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/core/hcd.c > > between commit: > > 63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}") > > from the usb.current tree and

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in: drivers/usb/core/hcd.c between commit: 63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}") from the usb.current tree and commit: bc40f5341741 ("USB: core: hcd: drop support for legacy phys") from the usb

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in: drivers/usb/core/hcd.c between commit: 63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}") from the usb.current tree and commit: bc40f5341741 ("USB: core: hcd: drop support for legacy phys") from the usb

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Jan 03, 2018 at 11:56:42AM +1100, Stephen Rothwell wrote: > Hi Greg, > > On Wed, 20 Dec 2017 10:36:15 +0100 Greg KH wrote: > > > > Thanks for the fixup, I'll do it when these trees converge in a week or > > so. > > Unfortunately, it looks like when you back merged Linus'

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Jan 03, 2018 at 11:56:42AM +1100, Stephen Rothwell wrote: > Hi Greg, > > On Wed, 20 Dec 2017 10:36:15 +0100 Greg KH wrote: > > > > Thanks for the fixup, I'll do it when these trees converge in a week or > > so. > > Unfortunately, it looks like when you back merged Linus' tree (to get >

Re: linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, On Wed, 20 Dec 2017 10:36:15 +0100 Greg KH wrote: > > Thanks for the fixup, I'll do it when these trees converge in a week or > so. Unfortunately, it looks like when you back merged Linus' tree (to get commit 8272d099d05f) you lost the spelling fix in commit

Re: linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, On Wed, 20 Dec 2017 10:36:15 +0100 Greg KH wrote: > > Thanks for the fixup, I'll do it when these trees converge in a week or > so. Unfortunately, it looks like when you back merged Linus' tree (to get commit 8272d099d05f) you lost the spelling fix in commit 81d8a8eb0a97. -- Cheers,

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Dec 20, 2017 at 01:09:49PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/usbip/vhci_rx.c > > between commit: > > 8272d099d05f ("usbip: vhci: stop printing kernel pointer addresses in > messages") > > from

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Dec 20, 2017 at 01:09:49PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/usbip/vhci_rx.c > > between commit: > > 8272d099d05f ("usbip: vhci: stop printing kernel pointer addresses in > messages") > > from

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in: drivers/usb/usbip/vhci_rx.c between commit: 8272d099d05f ("usbip: vhci: stop printing kernel pointer addresses in messages") from the usb.current tree and commit: 81d8a8eb0a97 ("USB: usbip: fix spelling mistake:

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in: drivers/usb/usbip/vhci_rx.c between commit: 8272d099d05f ("usbip: vhci: stop printing kernel pointer addresses in messages") from the usb.current tree and commit: 81d8a8eb0a97 ("USB: usbip: fix spelling mistake:

Re: linux-next: manual merge of the usb tree with the usb.current tree

Hi all, On Wed, 5 Nov 2014 18:19:34 -0800 Greg KH wrote: > > On Wed, Nov 05, 2014 at 09:33:33AM +0100, Paul Bolle wrote: > > On Tue, 2014-11-04 at 20:30 -0800, Greg KH wrote: > > > On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: > > > > Today's linux-next merge of the usb tree

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Nov 05, 2014 at 09:33:33AM +0100, Paul Bolle wrote: > On Tue, 2014-11-04 at 20:30 -0800, Greg KH wrote: > > On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: > > > Today's linux-next merge of the usb tree got a conflict in > > > drivers/usb/host/Kconfig between commit

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Tue, 2014-11-04 at 20:30 -0800, Greg KH wrote: > On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: > > Today's linux-next merge of the usb tree got a conflict in > > drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove > > references to non-existent PLAT_S5P

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Tue, 2014-11-04 at 20:30 -0800, Greg KH wrote: On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/Kconfig between commit cd6e245a2d06 (usb: Remove references to non-existent PLAT_S5P symbol) from

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Nov 05, 2014 at 09:33:33AM +0100, Paul Bolle wrote: On Tue, 2014-11-04 at 20:30 -0800, Greg KH wrote: On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/Kconfig between commit cd6e245a2d06

Re: linux-next: manual merge of the usb tree with the usb.current tree

Hi all, On Wed, 5 Nov 2014 18:19:34 -0800 Greg KH g...@kroah.com wrote: On Wed, Nov 05, 2014 at 09:33:33AM +0100, Paul Bolle wrote: On Tue, 2014-11-04 at 20:30 -0800, Greg KH wrote: On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: Today's linux-next merge of the usb

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove > references to non-existent PLAT_S5P symbol") from the usb.current tree > and commit

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove references to non-existent PLAT_S5P symbol") from the usb.current tree and commit dd3cf17488b1 ("usb: host: Remove optional dependencies on PLAT_S5P") from the

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/Kconfig between commit cd6e245a2d06 (usb: Remove references to non-existent PLAT_S5P symbol) from the usb.current tree and commit dd3cf17488b1 (usb: host: Remove optional dependencies on PLAT_S5P) from the usb

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/Kconfig between commit cd6e245a2d06 (usb: Remove references to non-existent PLAT_S5P symbol) from the usb.current tree and commit

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/ohci-at91.c between commit fb5f1834c322 ("usb: ohci-at91: fix irq and iomem resource retrieval") from the usb.current tree and commit 3c9740a117d4 ("usb: hcd: move controller wakeup setting initialization to

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/ohci-at91.c between commit fb5f1834c322 (usb: ohci-at91: fix irq and iomem resource retrieval) from the usb.current tree and commit 3c9740a117d4 (usb: hcd: move controller wakeup setting initialization to

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/ehci-timer.c between commit d714aaf64946 ("USB: EHCI: fix regression in QH unlinking") from the usb.current tree and commit 60fd4aa742a0 ("USB: EHCI: reorganize ehci_iaa_watchdog()") from the usb tree. I assume

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/ehci-timer.c between commit d714aaf64946 (USB: EHCI: fix regression in QH unlinking) from the usb.current tree and commit 60fd4aa742a0 (USB: EHCI: reorganize ehci_iaa_watchdog()) from the usb tree. I assume that

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Nov 14, 2012 at 03:07:46PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got conflicts in > drivers/usb/host/ehci-ls1x.c and drivers/usb/host/ohci-xls.c between > commit e592c5d0b7db ("Revert "USB/host: Cleanup unneccessary irq disable > code"")

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Nov 14, 2012 at 03:07:46PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the usb tree got conflicts in drivers/usb/host/ehci-ls1x.c and drivers/usb/host/ohci-xls.c between commit e592c5d0b7db (Revert USB/host: Cleanup unneccessary irq disable code) from the

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got conflicts in drivers/usb/host/ehci-ls1x.c and drivers/usb/host/ohci-xls.c between commit e592c5d0b7db ("Revert "USB/host: Cleanup unneccessary irq disable code"") from the usb.current tree and commits ead92fae1290 ("USB: EHCI: remove Loongson

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Tue, Nov 13, 2012 at 02:37:32PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/musb/ux500.c between commit 9a65d162e449 ("usb: musb: ux500: > fix 'musbid' undeclared error in ux500_remove()") from the usb.current > tree

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Tue, Nov 13, 2012 at 02:37:32PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/musb/ux500.c between commit 9a65d162e449 (usb: musb: ux500: fix 'musbid' undeclared error in ux500_remove()) from the usb.current tree and commit

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got conflicts in drivers/usb/host/ehci-ls1x.c and drivers/usb/host/ohci-xls.c between commit e592c5d0b7db (Revert USB/host: Cleanup unneccessary irq disable code) from the usb.current tree and commits ead92fae1290 (USB: EHCI: remove Loongson 1B

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/musb/ux500.c between commit 9a65d162e449 ("usb: musb: ux500: fix 'musbid' undeclared error in ux500_remove()") from the usb.current tree and commit 2f7711642559 ("usb: musb: remove hand-crafted id handling") from the

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/musb/ux500.c between commit 9a65d162e449 (usb: musb: ux500: fix 'musbid' undeclared error in ux500_remove()) from the usb.current tree and commit 2f7711642559 (usb: musb: remove hand-crafted id handling) from the usb

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Thu, Oct 25, 2012 at 01:05:45PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/misc/ezusb.c between commit 197ef5ef37d9 ("USB: Add missing > license tag to ezusb driver") from the usb.current tree and commitc > 30186e51e53

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/misc/ezusb.c between commit 197ef5ef37d9 ("USB: Add missing license tag to ezusb driver") from the usb.current tree and commitc 30186e51e53 ("USB: ezusb: unexport some functions that aren't being used") from the usb

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/misc/ezusb.c between commit 197ef5ef37d9 (USB: Add missing license tag to ezusb driver) from the usb.current tree and commitc 30186e51e53 (USB: ezusb: unexport some functions that aren't being used) from the usb tree.

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Thu, Oct 25, 2012 at 01:05:45PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/misc/ezusb.c between commit 197ef5ef37d9 (USB: Add missing license tag to ezusb driver) from the usb.current tree and commitc 30186e51e53 (USB:

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Sep 12, 2012 at 03:37:56PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/dwc3/gadget.c between commit f4a53c55117b ("usb: dwc3: > gadget: fix pending isoc handling") from the usb.current tree and commit >

Re: linux-next: manual merge of the usb tree with the usb.current tree

On Wed, Sep 12, 2012 at 03:37:56PM +1000, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/dwc3/gadget.c between commit f4a53c55117b (usb: dwc3: gadget: fix pending isoc handling) from the usb.current tree and commit 348e026fafe2 (usb:

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/dwc3/gadget.c between commit f4a53c55117b ("usb: dwc3: gadget: fix pending isoc handling") from the usb.current tree and commit 348e026fafe2 ("usb: dwc3: gadget: Fix sparse warnings") from the usb tree. I fixed it up

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/musb/tusb6010.c between commit ff41aaa3b6c1 ("usb: musb: tusb6010: fix error path in tusb_probe()") from the usb.current tree and commit 65b3d52d02a5 ("usb: musb: add musb_ida for multi instance support") from the usb

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/musb/tusb6010.c between commit ff41aaa3b6c1 (usb: musb: tusb6010: fix error path in tusb_probe()) from the usb.current tree and commit 65b3d52d02a5 (usb: musb: add musb_ida for multi instance support) from the usb

linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/dwc3/gadget.c between commit f4a53c55117b (usb: dwc3: gadget: fix pending isoc handling) from the usb.current tree and commit 348e026fafe2 (usb: dwc3: gadget: Fix sparse warnings) from the usb tree. I fixed it up