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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

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 the usb tree.

I fixed it up (see below) 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 to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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:
> 
>   ecefae6db042 ("docs: usb: rename files to .rst and add them to drivers-api")
> 
> from the usb tree.
> 
> I fixed it up (see below) 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 to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 

No patch "below", but I'm sure the fixup is fine :)

thanks,

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 584 bytes --]

Hi Greg,

On Mon, 24 Jun 2019 15:34:43 +0800 Greg KH <greg@kroah.com> 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..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -101,7 -101,7 +101,8 @@@ needed)
     filesystems/index
     vm/index
     bpf/index
 +   PCI/index
+    usb/index
     misc-devices/index
  
  Architecture-specific documentation

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]

Hi all,

On Mon, 24 Jun 2019 17:47:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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:
> 
>   ecefae6db042 ("docs: usb: rename files to .rst and add them to drivers-api")
> 
> from the usb tree.
> 
> I fixed it up (see below) 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 to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc Documentation/index.rst
> index 239100accbf6,91055adde327..000000000000
> --- a/Documentation/index.rst
> +++ b/Documentation/index.rst
> @@@ -101,7 -101,7 +101,8 @@@ needed)
>      filesystems/index
>      vm/index
>      bpf/index
>  +   PCI/index
> +    usb/index
>      misc-devices/index
>   
>   Architecture-specific documentation

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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 <sfr@canb.auug.org.au> 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:
> > 
> >   ecefae6db042 ("docs: usb: rename files to .rst and add them to drivers-api")
> > 
> > from the usb tree.
> > 
> > I fixed it up (see below) 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 to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell
> > 
> > diff --cc Documentation/index.rst
> > index 239100accbf6,91055adde327..000000000000
> > --- a/Documentation/index.rst
> > +++ b/Documentation/index.rst
> > @@@ -101,7 -101,7 +101,8 @@@ needed)
> >      filesystems/index
> >      vm/index
> >      bpf/index
> >  +   PCI/index
> > +    usb/index
> >      misc-devices/index
> >   
> >   Architecture-specific documentation
> 
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.

For a merge issue like this, I think he can handle it :)

thanks,

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

Hi Greg,

On Tue, 9 Jul 2019 08:35:10 +0200 Greg KH <greg@kroah.com> 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Jim Quinlan]

[-- Attachment #1: Type: text/plain, Size: 1757 bytes --]

On Thu, Oct 15, 2020 at 5:48 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Mon, 21 Sep 2020 15:18:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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:
> >
> >   f48cc509c935 ("Revert "PCI: brcmstb: Wait for Raspberry Pi's firmware when present"")
> >
> > from the usb tree.
> >
> > I fixed it up (see below) 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 to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > diff --cc drivers/pci/controller/pcie-brcmstb.c
> > index 6e7aa82a54a3,bac63d04297f..000000000000
> > --- a/drivers/pci/controller/pcie-brcmstb.c
> > +++ b/drivers/pci/controller/pcie-brcmstb.c
> > @@@ -1213,8 -929,6 +1211,7 @@@ static int brcm_pcie_probe(struct platf
> >   {
> >       struct device_node *np = pdev->dev.of_node, *msi_np;
> >       struct pci_host_bridge *bridge;
> > -     struct device_node *fw_np;
> >  +    const struct pcie_cfg_data *data;
> >       struct brcm_pcie *pcie;
> >       int ret;
> >
>
> This is now a conflict between the pci tree and Linus' tree.
Hello,
Sorry, I did not foresee a conflict.  Please keep both lines below.

     struct device_node *fw_np;
     const struct pcie_cfg_data *data;

Thank you,
Jim Quinlan
Broadcom STB


>
> --
> Cheers,
> Stephen Rothwell

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4167 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1444 bytes --]

Hi all,

On Mon, 21 Sep 2020 15:18:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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:
> 
>   f48cc509c935 ("Revert "PCI: brcmstb: Wait for Raspberry Pi's firmware when present"")
> 
> from the usb tree.
> 
> I fixed it up (see below) 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 to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc drivers/pci/controller/pcie-brcmstb.c
> index 6e7aa82a54a3,bac63d04297f..000000000000
> --- a/drivers/pci/controller/pcie-brcmstb.c
> +++ b/drivers/pci/controller/pcie-brcmstb.c
> @@@ -1213,8 -929,6 +1211,7 @@@ static int brcm_pcie_probe(struct platf
>   {
>   	struct device_node *np = pdev->dev.of_node, *msi_np;
>   	struct pci_host_bridge *bridge;
> - 	struct device_node *fw_np;
>  +	const struct pcie_cfg_data *data;
>   	struct brcm_pcie *pcie;
>   	int ret;
>   

This is now a conflict between the pci tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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 commit:
> 
>   f48cc509c935 ("Revert "PCI: brcmstb: Wait for Raspberry Pi's firmware when present"")
> 
> from the usb tree.
> 
> I fixed it up (see below) 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 to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/pci/controller/pcie-brcmstb.c
> index 6e7aa82a54a3,bac63d04297f..000000000000
> --- a/drivers/pci/controller/pcie-brcmstb.c
> +++ b/drivers/pci/controller/pcie-brcmstb.c
> @@@ -1213,8 -929,6 +1211,7 @@@ static int brcm_pcie_probe(struct platf
>   {
>   	struct device_node *np = pdev->dev.of_node, *msi_np;
>   	struct pci_host_bridge *bridge;
> - 	struct device_node *fw_np;
>  +	const struct pcie_cfg_data *data;
>   	struct brcm_pcie *pcie;
>   	int ret;
>   

Looks good to me, thanks!

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1225 bytes --]

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 present"")

from the usb tree.

I fixed it up (see below) 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 to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/controller/pcie-brcmstb.c
index 6e7aa82a54a3,bac63d04297f..000000000000
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@@ -1213,8 -929,6 +1211,7 @@@ static int brcm_pcie_probe(struct platf
  {
  	struct device_node *np = pdev->dev.of_node, *msi_np;
  	struct pci_host_bridge *bridge;
- 	struct device_node *fw_np;
 +	const struct pcie_cfg_data *data;
  	struct brcm_pcie *pcie;
  	int ret;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]