1
0
Fork 0
alistair23-linux/drivers/nvme/host
Linus Torvalds 894e21642d Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
 "A small collection of fixes that should go into this cycle.

   - a pull request from Christoph for NVMe, which ended up being
     manually applied to avoid pulling in newer bits in master. Mostly
     fibre channel fixes from James, but also a few fixes from Jon and
     Vijay

   - a pull request from Konrad, with just a single fix for xen-blkback
     from Gustavo.

   - a fuseblk bdi fix from Jan, fixing a regression in this series with
     the dynamic backing devices.

   - a blktrace fix from Shaohua, replacing sscanf() with kstrtoull().

   - a request leak fix for drbd from Lars, fixing a regression in the
     last series with the kref changes. This will go to stable as well"

* 'for-linus' of git://git.kernel.dk/linux-block:
  nvmet: release the sq ref on rdma read errors
  nvmet-fc: remove target cpu scheduling flag
  nvme-fc: stop queues on error detection
  nvme-fc: require target or discovery role for fc-nvme targets
  nvme-fc: correct port role bits
  nvme: unmap CMB and remove sysfs file in reset path
  blktrace: fix integer parse
  fuseblk: Fix warning in super_setup_bdi_name()
  block: xen-blkback: add null check to avoid null pointer dereference
  drbd: fix request leak introduced by locking/atomic, kref: Kill kref_sub()
2017-05-20 16:12:30 -07:00
..
Kconfig nvme-fabrics: Add host support for FC transport 2016-12-06 10:17:56 +02:00
Makefile nvme-fabrics: Add host support for FC transport 2016-12-06 10:17:56 +02:00
core.c nvme: Add nvme_core.force_apst to ignore the NO_APST quirk 2017-04-24 22:03:46 -06:00
fabrics.c nvme-fabrics: Allow ctrl loss timeout configuration 2017-04-04 09:48:23 -06:00
fabrics.h nvme-fabrics: Allow ctrl loss timeout configuration 2017-04-04 09:48:23 -06:00
fc.c nvme-fc: stop queues on error detection 2017-05-20 10:11:34 -06:00
lightnvm.c nvme: lightnvm: fix memory leak 2017-05-10 07:39:43 -06:00
nvme.h Merge branch 'master' into for-4.12/post-merge 2017-04-24 22:03:14 -06:00
pci.c Merge branch 'for-linus' of git://git.kernel.dk/linux-block 2017-05-20 16:12:30 -07:00
rdma.c blk-mq: update ->init_request and ->exit_request prototypes 2017-05-02 07:52:08 -06:00
scsi.c nvme-scsi: remove nvme_trans_security_protocol 2017-04-27 08:39:32 +02:00