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

2018-05-17 Thread Greg KH
On Thu, May 17, 2018 at 02:03:18PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb-gadget tree got a conflict in: > > drivers/usb/mtu3/Kconfig > > between commit: > > cd91a0e9d38f ("usb: Remove depends on HAS_DMA in case of platform > dependency") > > from

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

2017-10-19 Thread Felipe Balbi
Hi, Kees Cook writes: > On Wed, Oct 18, 2017 at 7:42 AM, Mark Brown wrote: >> Hi Felipe, >> >> Today's linux-next merge of the usb-gadget tree got a conflict in: >> >> drivers/usb/gadget/udc/snps_udc_core.c >> >> between commit: >> >> 29bce57723351f63d ("usb/gadget/snps_udc_core: Convert ti

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

2017-10-18 Thread Mark Brown
On Wed, Oct 18, 2017 at 08:40:04AM -0700, Kees Cook wrote: > On Wed, Oct 18, 2017 at 7:49 AM, Mark Brown wrote: > > I fixed it up with the USB version and can carry the fix as necessary. This > > is now fixed as far as linux-next is concerned, but any non trivial > > conflicts should be mentioned

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

2017-10-18 Thread Kees Cook
On Wed, Oct 18, 2017 at 7:42 AM, Mark Brown wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in: > > drivers/usb/gadget/udc/snps_udc_core.c > > between commit: > > 29bce57723351f63d ("usb/gadget/snps_udc_core: Convert timers to use > timer_setup()") > > f

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

2017-10-18 Thread Kees Cook
On Wed, Oct 18, 2017 at 7:49 AM, Mark Brown wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in: > > drivers/usb/phy/phy-isp1301-omap.c > > between commit: > > 4c13fec1ba55595 ("usb: isp1301-omap: Convert timers to use timer_setup()") > > from the usb tree

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

2014-11-05 Thread Felipe Balbi
On Thu, Nov 06, 2014 at 02:58:32PM +1100, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/chipidea/otg_fsm.c between commit 51f1741fcc16 ("usb: > chipidea: otg_fsm: delete unnecessary 'out of memory' messages") from > the usb

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

2014-04-28 Thread Felipe Balbi
On Mon, Apr 28, 2014 at 03:20:44PM +1000, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/phy/phy-mv-u3d-usb.c between commit 543cab640279 ("usb: phy: > mv_u3d: Remove usb phy driver for mv_u3d") from the usb tree and commit

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

2013-08-02 Thread Felipe Balbi
Hi, On Fri, Aug 02, 2013 at 04:38:18PM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/host/ehci-tegra.c between commit d4f09e28d7bc ("USB: host: > use dev_get_platdata()") from the usb tree and commit d50642794508 ("usb: > tegra: ho

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

2013-04-04 Thread Felipe Balbi
On Thu, Apr 04, 2013 at 08:27:30AM +0200, Thierry Reding wrote: > On Thu, Apr 04, 2013 at 03:18:45PM +1100, Stephen Rothwell wrote: > > Hi Felipe, > > > > Today's linux-next merge of the usb-gadget tree got a conflict in > > drivers/usb/host/ehci-tegra.c between commit 369a9a9d2af7 ("usb: host: >

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

2013-04-03 Thread Thierry Reding
On Thu, Apr 04, 2013 at 03:18:45PM +1100, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/host/ehci-tegra.c between commit 369a9a9d2af7 ("usb: host: > ehci-tegra: Fix oops in error cleanup") from the usb tree and commit > 426