From: Linus Torvalds Date: Fri, 27 Jan 2017 20:36:39 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block X-Git-Tag: v5.15~12017 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2fb78e89405f4321b86274a0c24b30896dd50529;p=mirror_ubuntu-kernels.git Merge branch 'for-linus' of git://git.kernel.dk/linux-block Pull block fixes from Jens Axboe: "A set of fixes for this series. This contains: - Set of fixes for the nvme target code - A revert of patch from this merge window, causing a regression with WRITE_SAME on iSCSI targets at least. - A fix for a use-after-free in the new O_DIRECT bdev code. - Two fixes for the xen-blkfront driver" * 'for-linus' of git://git.kernel.dk/linux-block: Revert "sd: remove __data_len hack for WRITE SAME" nvme-fc: use blk_rq_nr_phys_segments nvmet-rdma: Fix missing dma sync to nvme data structures nvmet: Call fatal_error from keep-alive timout expiration nvmet: cancel fatal error and flush async work before free controller nvmet: delete controllers deletion upon subsystem release nvmet_fc: correct logic in disconnect queue LS handling block: fix use after free in __blkdev_direct_IO xen-blkfront: correct maximum segment accounting xen-blkfront: feature flags handling adjustments --- 2fb78e89405f4321b86274a0c24b30896dd50529