From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 14 Jan 2021 22:17:33 +0000 (-0700)
Subject: Merge tag 'nvme-5.11-2021-01-14' of git://git.infradead.org/nvme into block-5.11
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b4f664252f51e119e9403ef84b6e9ff36d119510;p=linux.git

Merge tag 'nvme-5.11-2021-01-14' of git://git.infradead.org/nvme into block-5.11

Pull NVMe fixes from Christoph:

"nvme fixes for 5.11:

 - 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 'nvme-5.11-2021-01-14' of git://git.infradead.org/nvme:
  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
---

b4f664252f51e119e9403ef84b6e9ff36d119510