lkml.org 
[lkml]   [2016]   [Feb]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the block tree with Linus' tree
Hi Jens,

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

drivers/nvme/host/pci.c

between commits:

7ba7735d039c ("NVMe: Poll device while still active during remove")
f8e68a7c9af5 ("NVMe: Rate limit nvme IO warnings")

from Linus' tree and commit:

1b3c47c182aa ("nvme: Log the ctrl device name instead of the underlying pci device name")
9396dec916c0 ("nvme: use a work item to submit async event requests")
2d55cd5f511d ("nvme: replace the kthread with a per-device watchdog timer")

from the block tree.

I fixed it up (maybe - see below) and can carry the fix as necessary
(no action is required).

--
Cheers,
Stephen Rothwell

diff --cc drivers/nvme/host/pci.c
index a128672472ec,d47b08783110..000000000000
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@@ -1004,7 -992,7 +997,7 @@@ static void nvme_cancel_queue_ios(struc
if (!blk_mq_request_started(req))
return;

- dev_dbg_ratelimited(nvmeq->q_dmadev,
- dev_warn(nvmeq->dev->ctrl.device,
++ dev_dbg_ratelimited(nvmeq->dev->ctrl.device,
"Cancelling I/O %d QID %d\n", req->tag, nvmeq->qid);

status = NVME_SC_ABORT_REQ;
@@@ -2116,7 -2042,11 +2047,10 @@@ static void nvme_remove(struct pci_dev
{
struct nvme_dev *dev = pci_get_drvdata(pdev);

+ del_timer_sync(&dev->watchdog_timer);
+
pci_set_drvdata(pdev, NULL);
+ flush_work(&dev->async_work);
- flush_work(&dev->reset_work);
flush_work(&dev->scan_work);
nvme_remove_namespaces(&dev->ctrl);
nvme_uninit_ctrl(&dev->ctrl);

\
 
 \ /
  Last update: 2016-03-01 02:01    [W:0.022 / U:0.764 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site