Merge pull request #1333 from sc108-lee/fix/#1324

author Daniel Wagner <dwagner@suse.de>

Fri, 21 Jan 2022 09:14:44 +0000 (10:14 +0100)

committer GitHub <noreply@github.com>

Fri, 21 Jan 2022 09:14:44 +0000 (10:14 +0100)
author Daniel Wagner <dwagner@suse.de>
Fri, 21 Jan 2022 09:14:44 +0000 (10:14 +0100)
committer GitHub <noreply@github.com>
Fri, 21 Jan 2022 09:14:44 +0000 (10:14 +0100)
diff --cc nvme-print.c
Simple merge
diff --cc nvme.c
Simple merge
author	Daniel Wagner <dwagner@suse.de>
	Fri, 21 Jan 2022 09:14:44 +0000 (10:14 +0100)
committer	GitHub <noreply@github.com>
	Fri, 21 Jan 2022 09:14:44 +0000 (10:14 +0100)
		1	2
nvme-print.c	patch \|	diff1 \|	diff2 \|	blob \| history
nvme.c	patch \|	diff1 \|	diff2 \|	blob \| history