linux-next: manual merge of the block tree with the pci tree

From: Stephen Rothwell
Date: Tue Jun 20 2017 - 22:58:15 EST

Hi all,

Today's linux-next merge of the block tree got a conflict in:


between commit:

c336cc0ee4eb ("PCI: Split ->reset_notify() method into ->reset_prepare() and ->reset_done()")

from the pci tree and commit:

d86c4d8ef31b ("nvme: move reset workqueue handling to common code")

from the block 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.

Stephen Rothwell

diff --cc drivers/nvme/host/pci.c
index 06f014d1a99a,0f09a2d5cf7a..000000000000
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@@ -2150,14 -2281,14 +2281,15 @@@ static int nvme_probe(struct pci_dev *p
return result;

-static void nvme_reset_notify(struct pci_dev *pdev, bool prepare)
+static void nvme_reset_prepare(struct pci_dev *pdev)
- struct nvme_dev *dev = pci_get_drvdata(pdev);
+ nvme_dev_disable(pci_get_drvdata(pdev), false);

- if (prepare)
- nvme_dev_disable(dev, false);
- else
- nvme_reset_ctrl(&dev->ctrl);
+static void nvme_reset_done(struct pci_dev *pdev)
- nvme_reset(pci_get_drvdata(pdev));
++ struct nvme_dev *dev = pci_get_drvdata(pdev);
++ nvme_reset_ctrl(&dev->ctrl);

static void nvme_shutdown(struct pci_dev *pdev)