From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ralf Baechle <ralf@linux-mips.org>,
James Hogan <james.hogan@imgtec.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Manuel Lauss <manuel.lauss@gmail.com>
Subject: linux-next: manual merge of the mips tree with the pci-current tree
Date: Fri, 22 Sep 2017 10:01:14 +1000 [thread overview]
Message-ID: <20170922100114.569b940e@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-09-22 0:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-22 0:01 Stephen Rothwell [this message]
2017-09-22 9:20 ` linux-next: manual merge of the mips tree with the pci-current tree Lorenzo Pieralisi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170922100114.569b940e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bhelgaas@google.com \
--cc=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=manuel.lauss@gmail.com \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox