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

2020-10-16 Thread Jim Quinlan
On Thu, Oct 15, 2020 at 5:48 PM Stephen Rothwell wrote: > > Hi all, > > On Mon, 21 Sep 2020 15:18:07 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the usb tree got a conflict in: > > > > drivers/pci/controller/pcie-brcmstb.c > > > > between commit: > > > > 1cf1b0a6dd95

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

2020-10-15 Thread Stephen Rothwell
Hi all, On Mon, 21 Sep 2020 15:18:07 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/pci/controller/pcie-brcmstb.c > > between commit: > > 1cf1b0a6dd95 ("PCI: brcmstb: Add bcm7278 register info") > > from the pci tree and commit:

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

2020-09-21 Thread Greg KH
On Mon, Sep 21, 2020 at 03:18:07PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/pci/controller/pcie-brcmstb.c > > between commit: > > 1cf1b0a6dd95 ("PCI: brcmstb: Add bcm7278 register info") > > from the pci tree and c

linux-next: manual merge of the usb tree with the pci tree

2020-09-20 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the usb tree got a conflict in: drivers/pci/controller/pcie-brcmstb.c between commit: 1cf1b0a6dd95 ("PCI: brcmstb: Add bcm7278 register info") from the pci tree and commit: f48cc509c935 ("Revert "PCI: brcmstb: Wait for Raspberry Pi's firmware when pr

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

2019-07-08 Thread Stephen Rothwell
Hi Greg, On Tue, 9 Jul 2019 08:35:10 +0200 Greg KH wrote: > > For a merge issue like this, I think he can handle it :) Yeah, I nearly didn't send the reminder at all, but I was on a roll ... ;-) -- Cheers, Stephen Rothwell pgpOUBOSmSVwg.pgp Description: OpenPGP digital signature

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

2019-07-08 Thread Greg KH
On Tue, Jul 09, 2019 at 09:58:33AM +1000, Stephen Rothwell wrote: > Hi all, > > On Mon, 24 Jun 2019 17:47:29 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the usb tree got a conflict in: > > > > Documentation/index.rst > > > > between commit: > > > > c42eaffa1656 ("D

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

2019-07-08 Thread Stephen Rothwell
Hi all, On Mon, 24 Jun 2019 17:47:29 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the usb tree got a conflict in: > > Documentation/index.rst > > between commit: > > c42eaffa1656 ("Documentation: add Linux PCI to Sphinx TOC tree") > > from the pci tree and commit: > >

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

2019-06-24 Thread Stephen Rothwell
Hi Greg, On Mon, 24 Jun 2019 15:34:43 +0800 Greg KH wrote: > > No patch "below", but I'm sure the fixup is fine :) Sorry about that (not sure what happened). See below (t is trivial). -- Cheers, Stephen Rothwell diff --cc Documentation/index.rst index 239100accbf6,91055adde327..

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

2019-06-24 Thread Greg KH
On Mon, Jun 24, 2019 at 05:12:29PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > Documentation/index.rst > > between commit: > > c42eaffa1656 ("Documentation: add Linux PCI to Sphinx TOC tree") > > from the pci tree and commit:

linux-next: manual merge of the usb tree with the pci tree

2019-06-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the usb tree got a conflict in: Documentation/index.rst between commit: c42eaffa1656 ("Documentation: add Linux PCI to Sphinx TOC tree") from the pci tree and commit: ecefae6db042 ("docs: usb: rename files to .rst and add them to drivers-api") from t