Merge tag 'uuid-for-4.13' of git://git.infradead.org/users/hch/uuid into overlayfs...
authorMiklos Szeredi <mszeredi@redhat.com>
Tue, 4 Jul 2017 02:05:05 +0000 (04:05 +0200)
committerMiklos Szeredi <mszeredi@redhat.com>
Tue, 4 Jul 2017 02:05:05 +0000 (04:05 +0200)
UUID/GUID updates:

 - introduce the new uuid_t/guid_t types that are going to replace
   the somewhat confusing uuid_be/uuid_le types and make the terminology
   fit the various specs, as well as the userspace libuuid library.
   (me, based on a previous version from Amir)
 - consolidated generic uuid/guid helper functions lifted from XFS
   and libnvdimm (Amir and me)
 - conversions to the new types and helpers (Amir, Andy and me)

1  2 
MAINTAINERS
drivers/md/md.c
drivers/nvme/host/fc.c
drivers/scsi/scsi_debug.c
drivers/usb/host/xhci-pci.c
fs/ext4/super.c
fs/overlayfs/copy_up.c
include/acpi/acpi_bus.h

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/md/md.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/super.c
Simple merge
Simple merge
Simple merge