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

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)

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 drivers/usb/host/xhci-pci.c
Simple merge

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

diff --cc fs/overlayfs/copy_up.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge