From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 28 Oct 2021 14:35:02 +0000 (-0600)
Subject: Merge tag 'nvme-5.16-2021-10-28' of git://git.infradead.org/nvme into for-5.16/drivers
X-Git-Tag: v6.6.17~8867^2~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca7787973a8652651bf391a5be6bec236a367c9c;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'nvme-5.16-2021-10-28' of git://git.infradead.org/nvme into for-5.16/drivers

Pull NVMe updates from Christoph:

"nvme updates for Linux 5.16

 - support the current discovery subsystem entry (Hannes Reinecke)
 - use flex_array_size and struct_size (Len Baker)"

* tag 'nvme-5.16-2021-10-28' of git://git.infradead.org/nvme:
  nvmet: use flex_array_size and struct_size
  nvmet: register discovery subsystem as 'current'
  nvmet: switch check for subsystem type
  nvme: add new discovery log page entry definitions
---

ca7787973a8652651bf391a5be6bec236a367c9c