From: Doug Ledford <dledford@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>,
"Michael J. Ruhl" <michael.j.ruhl@intel.com>
Subject: Re: linux-next: manual merge of the rdma tree with the pci tree
Date: Thu, 4 May 2017 23:35:00 -0400 [thread overview]
Message-ID: <5642d340-ae54-0f84-729f-59442201a513@redhat.com> (raw)
In-Reply-To: <20170505101910.3f1b0194@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 1367 bytes --]
On 5/4/2017 8:19 PM, Stephen Rothwell wrote:
> Hi Doug,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/hw/hfi1/hfi.h
>
> between commit:
>
> 21c433a74b6b ("IB/hfi1: Use pcie_flr() instead of duplicating it")
>
> from the pci tree and commit:
>
> f4cd87652919 ("IB/hfi1: Name function prototype parameters")
>
> from the rdma 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.
>
This is not unexpected entirely, only unexpected in that the PCI tree
hasn't been merged yet ;-). The first commit was part of a series that
was mainly a PCI series that just touched hfi1, so it's entirely
understandable that it went through the PCI tree and something in my
tree might happen, as it were, to touch the same area. Your fix was
fine and I'm sure Linus can sort the same thing out. Thanks ;-)
--
Doug Ledford <dledford@redhat.com>
GPG Key ID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]
prev parent reply other threads:[~2017-05-05 3:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-05 0:19 linux-next: manual merge of the rdma tree with the pci tree Stephen Rothwell
2017-05-05 3:35 ` Doug Ledford [this message]
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=5642d340-ae54-0f84-729f-59442201a513@redhat.com \
--to=dledford@redhat.com \
--cc=bhelgaas@google.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michael.j.ruhl@intel.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).