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 usb.curren
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 usb.cu
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
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
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 bui
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 tre
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 i
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 ("us
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:
> >
> > 63cb03f5c11e
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:
>
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 ("us
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 c
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
> c
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,
S
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
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
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 cd6e2
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
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 dd3
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"") fro
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
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
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
23 matches
Mail list logo
