Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1429394 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-06-23 03:50 +0200 |
| Last post | 2016-06-23 18:50 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the pci tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-23 03:50 +0200
Re: linux-next: manual merge of the pci tree with Linus' tree Bjorn Helgaas <helgaas@kernel.org> - 2016-06-23 18:50 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-06-23 03:50 +0200 |
| Subject | linux-next: manual merge of the pci tree with Linus' tree |
| Message-ID | <rN1Wi-2Yp-5@gated-at.bofh.it> |
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in:
drivers/nvme/host/pci.c
between commit:
edb50a5403d2 ("NVMe: Only release requested regions")
from Linus' tree and commit:
a1f447b35b72 ("NVMe: Use pci_(request|release)_mem_regions")
from the pci tree.
I fixed it up (I just used the pci tree version of this file) 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]
| From | Bjorn Helgaas <helgaas@kernel.org> |
|---|---|
| Date | 2016-06-23 18:50 +0200 |
| Message-ID | <rNfZg-4gz-11@gated-at.bofh.it> |
| In reply to | #1429394 |
On Thu, Jun 23, 2016 at 11:44:29AM +1000, Stephen Rothwell wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
> drivers/nvme/host/pci.c
>
> between commit:
>
> edb50a5403d2 ("NVMe: Only release requested regions")
>
> from Linus' tree and commit:
>
> a1f447b35b72 ("NVMe: Use pci_(request|release)_mem_regions")
>
> from the pci tree.
>
> I fixed it up (I just used the pci tree version of this file) 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.
Thanks for the heads-up. I think using the pci tree version is the
correct resolution.
Bjorn
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web