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