linux-next: manual merge of the pci tree with Linus' tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the pci tree with Linus' tree
Date	2016-06-23 03:50 +0200
Message-ID	<rN1Wi-2Yp-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

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

csiph-web