diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-04 09:03:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-04 09:03:37 -0800 |
commit | 62f8c40592172a9c3bc2658e63e6e76ba00b3b45 (patch) | |
tree | 52d2f8e00a3d795cb6956bc3e0b2975cf8fa7aae /fs/ocfs2/cluster/masklog.c | |
parent | 9f7445197a263c99ddb898f3609fed21673ae24c (diff) | |
parent | 7158339d4c1ede786c48fa5c062fa68df366ba94 (diff) | |
download | blackbird-obmc-linux-62f8c40592172a9c3bc2658e63e6e76ba00b3b45.tar.gz blackbird-obmc-linux-62f8c40592172a9c3bc2658e63e6e76ba00b3b45.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe:
"A set of fixes for the current series, one fixing a regression with
block size < page cache size in the alias series from Jan. Outside of
that, two small cleanups for wbt from Bart, a nvme pull request from
Christoph, and a few small fixes of documentation updates"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: fix up io_poll documentation
block: Avoid that sparse complains about context imbalance in __wbt_wait()
block: Make wbt_wait() definition consistent with declaration
clean_bdev_aliases: Prevent cleaning blocks that are not in block range
genhd: remove dead and duplicated scsi code
block: add back plugging in __blkdev_direct_IO
nvmet/fcloop: remove some logically dead code performing redundant ret checks
nvmet: fix KATO offset in Set Features
nvme/fc: simplify error handling of nvme_fc_create_hw_io_queues
nvme/fc: correct some printk information
nvme/scsi: Remove START STOP emulation
nvme/pci: Delete misleading queue-wrap comment
nvme/pci: Fix whitespace problem
nvme: simplify stripe quirk
nvme: update maintainers information
Diffstat (limited to 'fs/ocfs2/cluster/masklog.c')
0 files changed, 0 insertions, 0 deletions