From: Jens Axboe Date: Wed, 5 Jan 2022 19:26:19 +0000 (-0700) Subject: Merge branch 'for-5.17/drivers' into for-next X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0258616b103c6bf235280a772a2f98ca0d3225a2;p=users%2Fhch%2Fblock.git Merge branch 'for-5.17/drivers' into for-next * for-5.17/drivers: pktcdvd: convert to use attribute groups block: null_blk: only set set->nr_maps as 3 if active poll_queues is > 0 nvme: add 'iopolicy' module parameter nvme: drop unused variable ctrl in nvme_setup_cmd nvme: increment request genctr on completion nvme-fabrics: print out valid arguments when reading from /dev/nvme-fabrics --- 0258616b103c6bf235280a772a2f98ca0d3225a2