summaryrefslogtreecommitdiffstats
path: root/fs/ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-09-15 13:22:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-15 13:22:59 -0700
commit46626600d120dc48ab605265677b858506a81011 (patch)
tree3871c6ef5f80ebcad1dcf1d88dc005e41956af0b /fs/ioctl.c
parent1c109fabbd51863475cd12ac206bdd249aee35af (diff)
parent3bc42f3f0ef13a8239138a4c00a0b782f029f23d (diff)
downloadlinux-46626600d120dc48ab605265677b858506a81011.tar.bz2
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "A set of fixes for the current series in the realm of block. Like the previous pull request, the meat of it are fixes for the nvme fabrics/target code. Outside of that, just one fix from Gabriel for not doing a queue suspend if we didn't get the admin queue setup in the first place" * 'for-linus' of git://git.kernel.dk/linux-block: nvme-rdma: add back dependency on CONFIG_BLOCK nvme-rdma: fix null pointer dereference on req->mr nvme-rdma: use ib_client API to detect device removal nvme-rdma: add DELETING queue flag nvme/quirk: Add a delay before checking device ready for memblaze device nvme: Don't suspend admin queue that wasn't created nvme-rdma: destroy nvme queue rdma resources on connect failure nvme_rdma: keep a ref on the ctrl during delete/flush iw_cxgb4: block module unload until all ep resources are released iw_cxgb4: call dev_put() on l2t allocation failure
Diffstat (limited to 'fs/ioctl.c')
0 files changed, 0 insertions, 0 deletions