Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1737114 > unrolled thread

linux-next: manual merge of the mips tree with the pci-current tree

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the mips tree with the pci-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-09-22 02:10 +0200
    Re: linux-next: manual merge of the mips tree with the pci-current  tree Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> - 2017-09-22 11:20 +0200

#1737114 — linux-next: manual merge of the mips tree with the pci-current tree

Hi all,

Today's linux-next merge of the mips tree got a conflict in:

  arch/mips/pci/pci-octeon.c

between commit:

  19a8d6b7604d ("MIPS: PCI: Move map_irq() hooks out of initdata")

from the pci-current tree and commit:

  8eba3651f1da ("MIPS: PCI: fix pcibios_map_irq section mismatch")

from the mips tree.

I fixed it up (basically the same patch - I used the pci-current tree
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
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

[toc] | [next] | [standalone]

#1737321 — Re: linux-next: manual merge of the mips tree with the pci-current tree

Manuel, Ralf,

On Fri, Sep 22, 2017 at 10:01:14AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mips tree got a conflict in:
> 
>   arch/mips/pci/pci-octeon.c
> 
> between commit:
> 
>   19a8d6b7604d ("MIPS: PCI: Move map_irq() hooks out of initdata")

This commit (coming from the PCI tree) should be a superset of the fix
in the MIPS tree below, do you mind having a look please and if that's
the case drop commit below from the MIPS tree please ?

> from the pci-current tree and commit:
> 
>   8eba3651f1da ("MIPS: PCI: fix pcibios_map_irq section mismatch")
> 
> from the mips tree.
> 
> I fixed it up (basically the same patch - I used the pci-current tree
> 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
> 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.

I had no idea of:

8eba3651f1da ("MIPS: PCI: fix pcibios_map_irq section mismatch")

existence, apologies.

Lorenzo

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web