From: Linus Torvalds Date: Wed, 4 Jan 2017 17:03:37 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block X-Git-Tag: Ubuntu-5.0.0-8.9~5746 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=62f8c40592172a9c3bc2658e63e6e76ba00b3b45;p=mirror_ubuntu-disco-kernel.git 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 --- 62f8c40592172a9c3bc2658e63e6e76ba00b3b45