Merge branch 'master' into dst/fix

author Keith Busch <kbusch@kernel.org>

Tue, 26 Jan 2021 21:15:00 +0000 (14:15 -0700)

committer GitHub <noreply@github.com>

Tue, 26 Jan 2021 21:15:00 +0000 (14:15 -0700)
author Keith Busch <kbusch@kernel.org>
Tue, 26 Jan 2021 21:15:00 +0000 (14:15 -0700)
committer GitHub <noreply@github.com>
Tue, 26 Jan 2021 21:15:00 +0000 (14:15 -0700)
diff --cc nvme-ioctl.c
Simple merge
diff --cc nvme.c
Simple merge
author	Keith Busch <kbusch@kernel.org>
	Tue, 26 Jan 2021 21:15:00 +0000 (14:15 -0700)
committer	GitHub <noreply@github.com>
	Tue, 26 Jan 2021 21:15:00 +0000 (14:15 -0700)
		1	2
nvme-ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
nvme.c	patch \|	diff1 \|	diff2 \|	blob \| history