Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/nvme/host/fc.c
Simple merge

diff --cc drivers/scsi/scsi_debug.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/gfs2/ops_fstype.c
Simple merge

diff --cc include/linux/fs.h
Simple merge