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