From: Linus Torvalds Date: Sat, 16 Jan 2021 19:39:58 +0000 (-0800) Subject: Merge tag 'block-5.11-2021-01-16' of git://git.kernel.dk/linux-block X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=54c6247d06f110d2129f9ef75e5eb02d39aec316;p=linux.git Merge tag 'block-5.11-2021-01-16' of git://git.kernel.dk/linux-block Pull block fixes from Jens Axboe: "Just an nvme pull request via Christoph: - don't initialize hwmon for discover controllers (Sagi Grimberg) - fix iov_iter handling in nvme-tcp (Sagi Grimberg) - fix a preempt warning in nvme-tcp (Sagi Grimberg) - fix a possible NULL pointer dereference in nvme (Israel Rukshin)" * tag 'block-5.11-2021-01-16' of git://git.kernel.dk/linux-block: nvme: don't intialize hwmon for discovery controllers nvme-tcp: fix possible data corruption with bio merges nvme-tcp: Fix warning with CONFIG_DEBUG_PREEMPT nvmet-rdma: Fix NULL deref when setting pi_enable and traddr INADDR_ANY --- 54c6247d06f110d2129f9ef75e5eb02d39aec316