From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, 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>
Subject: linux-next: manual merge of the block tree with the pci tree
Date: Wed, 21 Jun 2017 12:58:07 +1000 [thread overview]
Message-ID: <20170621125807.490bc780@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the block tree got a conflict in:
drivers/nvme/host/pci.c
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.
--
Cheers,
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)
next reply other threads:[~2017-06-21 2:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 2:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-10-16 0:33 linux-next: manual merge of the block tree with the pci tree Stephen Rothwell
2024-11-07 5:24 Stephen Rothwell
2024-11-07 8:13 ` Philipp Stanner
2024-11-07 12:49 ` Jens Axboe
2024-11-07 13:11 ` Bjorn Helgaas
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=20170621125807.490bc780@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=bhelgaas@google$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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