From: Jens Axboe Date: Mon, 21 May 2018 14:33:37 +0000 (-0600) Subject: Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-4.18/block X-Git-Tag: v4.18-rc1~192^2~88 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81b1dab45809234958653dca29d04d4161f0a476;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-4.18/block Pull NVMe changes from Keith: "This is just the first nvme pull request for 4.18. There are several fabrics and target patches that I missed, so there will be more to come." * 'nvme-4.18' of git://git.infradead.org/nvme: nvme-pci: drop IRQ disabling on submission queue lock nvme-pci: split the nvme queue lock into submission and completion locks nvme-pci: handle completions outside of the queue lock nvme-pci: move ->cq_vector == -1 check outside of ->q_lock nvme-pci: remove cq check after submission nvme-pci: simplify nvme_cqe_valid nvme: mark the result argument to nvme_complete_async_event volatile nvme/pci: Sync controller reset for AER slot_reset nvme/pci: Hold controller reference during async probe nvme: only reconfigure discard if necessary nvme/pci: Use async_schedule for initial reset work nvme: lightnvm: add granby support NVMe: Add Quirk Delay before CHK RDY for Seagate Nytro Flash Storage nvme: change order of qid and cmdid in completion trace nvme: fc: provide a descriptive error --- 81b1dab45809234958653dca29d04d4161f0a476