summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-08-11 21:26:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2017-08-11 21:26:49 +0200
commite0d0e045b862da06f2a694696797b2c46ae8bc4f (patch)
tree896fcaa9b7f6102e234179a2b02197407a072008 /fs/nfs
parentMerge tag 'mmc-v4.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ul... (diff)
parentMerge branch 'nvme-4.13' of git://git.infradead.org/nvme into for-linus (diff)
downloadlinux-e0d0e045b862da06f2a694696797b2c46ae8bc4f.tar.xz
linux-e0d0e045b862da06f2a694696797b2c46ae8bc4f.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "A set of fixes that should go into this series. This contains: - Fix from Bart for blk-mq requeue queue running, preventing a continued loop of run/restart. - Fix for a bio/blk-integrity issue, in two parts. One from Christoph, fixing where verification happens, and one from Milan, for a NULL profile. - NVMe pull request, most of the changes being for nvme-fc, but also a few trivial core/pci fixes" * 'for-linus' of git://git.kernel.dk/linux-block: nvme: fix directive command numd calculation nvme: fix nvme reset command timeout handling nvme-pci: fix CMB sysfs file removal in reset path lpfc: support nvmet_fc defer_rcv callback nvmet_fc: add defer_req callback for deferment of cmd buffer return nvme: strip trailing 0-bytes in wwid_show block: Make blk_mq_delay_kick_requeue_list() rerun the queue at a quiet time bio-integrity: only verify integrity on the lowest stacked driver bio-integrity: Fix regression if profile verify_fn is NULL
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions