* linux-next: manual merge of the mips tree with the pci-current tree
@ 2017-09-22 0:01 Stephen Rothwell
2017-09-22 9:20 ` Lorenzo Pieralisi
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2017-09-22 0:01 UTC (permalink / raw)
To: Ralf Baechle, James Hogan, Bjorn Helgaas
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Lorenzo Pieralisi, Manuel Lauss
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the mips tree with the pci-current tree
2017-09-22 0:01 linux-next: manual merge of the mips tree with the pci-current tree Stephen Rothwell
@ 2017-09-22 9:20 ` Lorenzo Pieralisi
0 siblings, 0 replies; 2+ messages in thread
From: Lorenzo Pieralisi @ 2017-09-22 9:20 UTC (permalink / raw)
To: Stephen Rothwell, Ralf Baechle, Manuel Lauss
Cc: James Hogan, Bjorn Helgaas, Linux-Next Mailing List,
Linux Kernel Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-22 9:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-22 0:01 linux-next: manual merge of the mips tree with the pci-current tree Stephen Rothwell
2017-09-22 9:20 ` Lorenzo Pieralisi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).