1
0
Fork 0
alistair23-linux/drivers/block
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
..
aoe block: Use pointer to backing_dev_info from request_queue 2017-02-02 08:20:48 -07:00
drbd Merge branch 'for-linus' of git://git.kernel.dk/linux-block 2017-05-20 16:12:30 -07:00
mtip32xx mtip32xx: convert internal commands to regular block infrastructure 2017-05-03 08:09:19 -06:00
paride pd: don't check blk_execute_rq return value. 2017-04-20 12:16:10 -06:00
rsxx rsxx: remove the discard_zeroes_data flag 2017-04-08 11:25:38 -06:00
xen-blkback block: xen-blkback: add null check to avoid null pointer dereference 2017-05-15 17:14:28 -04:00
zram zram: reduce load operation in page_same_filled 2017-05-03 15:52:11 -07:00
DAC960.c Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
DAC960.h
Kconfig libnvdimm for 4.12 2017-05-05 18:49:20 -07:00
Makefile block: remove the osdblk driver 2017-04-19 09:10:51 -06:00
amiflop.c Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
ataflop.c ataflop: switch from req->errors to req->error_count 2017-04-20 12:16:10 -06:00
brd.c libnvdimm for 4.12 2017-05-05 18:49:20 -07:00
cciss.c scsi: introduce a result field in struct scsi_request 2017-04-20 12:16:10 -06:00
cciss.h SCSI misc on 20170220 2017-02-21 11:51:42 -08:00
cciss_cmd.h
cciss_scsi.c cciss: Remove kmalloc cast 2017-02-22 11:54:49 -07:00
cciss_scsi.h
cryptoloop.c Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
floppy.c floppy: switch from req->errors to req->error_count 2017-04-20 12:16:10 -06:00
loop.c blk-mq: update ->init_request and ->exit_request prototypes 2017-05-02 07:52:08 -06:00
loop.h loop: zero-fill bio on the submitting cpu 2017-04-20 12:16:10 -06:00
nbd.c treewide: convert PF_MEMALLOC manipulations to new helpers 2017-05-08 17:15:15 -07:00
null_blk.c blk-mq: remove the error argument to blk_mq_complete_request 2017-04-20 12:16:10 -06:00
pktcdvd.c scsi: introduce a result field in struct scsi_request 2017-04-20 12:16:10 -06:00
ps3disk.c block: fold cmd_type into the REQ_OP_ space 2017-01-31 14:00:44 -07:00
ps3vram.c block: convert to device_add_disk() 2016-06-27 12:26:08 -07:00
rbd.c The two main items are support for disabling automatic rbd exclusive 2017-05-10 08:42:33 -07:00
rbd_types.h rbd: RBD_V{1,2}_DATA_FORMAT macros 2017-02-20 12:16:15 +01:00
skd_main.c skd: implement trivial scsi ioctls directly 2017-01-31 10:53:03 -07:00
skd_s1120.h
smart1,2.h
sunvdc.c sunvdc: Add support for setting physical sector size 2017-02-23 08:24:08 -08:00
swim.c swim: stop sharing request queue across multiple gendisks 2017-03-28 15:06:58 -06:00
swim3.c swim3: remove (commented out) printing of req->errors 2017-04-20 12:16:10 -06:00
swim_asm.S
sx8.c block: fold cmd_type into the REQ_OP_ space 2017-01-31 14:00:44 -07:00
umem.c Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
umem.h
virtio_blk.c virtio: fixes, cleanups, performance 2017-05-10 11:33:08 -07:00
xen-blkfront.c blk-mq: remove the error argument to blk_mq_complete_request 2017-04-20 12:16:10 -06:00
xsysace.c block: fold cmd_type into the REQ_OP_ space 2017-01-31 14:00:44 -07:00
z2ram.c block: remove struct request buffer member 2014-04-15 14:03:02 -06:00