Merge tag 'uuid-for-4.14' of git://git.infradead.org/users/hch/uuid