Merge branch 'uuid-types' of git://git.infradead.org/users/hch/uuid into aarch64/for-next/ras-apei

Pull in uuid-types branch from Christoph, since this conflicts heavily with the ACPI/APEI RAS work from Tyler Baicer and was created as an immutable branch to avoid conflicts with ACPI development.
2026-10-14 05:55:17 +00:00 · 2017-06-20 19:11:48 +01:00 · 2017-06-20 19:11:48 +01:00 · dd19802f2a
commit dd19802f2a
parent 3c2993b8c6 87085ff2e9
76 changed files with 373 additions and 500 deletions
--- a/11
+++ b/11
--- a/arch/s390/include/asm/sysinfo.h
+++ b/arch/s390/include/asm/sysinfo.h
--- a/arch/s390/kernel/sysinfo.c
+++ b/arch/s390/kernel/sysinfo.c
--- a/block/partitions/ldm.c
+++ b/block/partitions/ldm.c
--- a/block/partitions/ldm.h
+++ b/block/partitions/ldm.h
--- a/drivers/acpi/acpi_extlog.c
+++ b/drivers/acpi/acpi_extlog.c
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
--- a/drivers/acpi/nfit/nfit.h
+++ b/drivers/acpi/nfit/nfit.h
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
--- a/drivers/gpu/drm/i915/intel_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
--- a/drivers/nvdimm/btt_devs.c
+++ b/drivers/nvdimm/btt_devs.c
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
--- a/drivers/nvme/host/fabrics.h
+++ b/drivers/nvme/host/fabrics.h
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
--- a/drivers/pci/pci-label.c
+++ b/drivers/pci/pci-label.c
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
--- a/drivers/usb/misc/ucsi.c
+++ b/drivers/usb/misc/ucsi.c
--- a/drivers/usb/typec/typec_wcove.c
+++ b/drivers/usb/typec/typec_wcove.c
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
--- a/fs/afs/cmservice.c
+++ b/fs/afs/cmservice.c
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
--- a/fs/afs/main.c
+++ b/fs/afs/main.c
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
--- a/fs/xfs/uuid.c
+++ b/fs/xfs/uuid.c
--- a/fs/xfs/uuid.h
+++ b/fs/xfs/uuid.h
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/cleancache.h
+++ b/include/linux/cleancache.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/nvme-fc.h
+++ b/include/linux/nvme-fc.h
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
--- a/include/linux/uuid.h
+++ b/include/linux/uuid.h
--- a/include/uapi/linux/uuid.h
+++ b/include/uapi/linux/uuid.h
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
--- a/lib/test_uuid.c
+++ b/lib/test_uuid.c
--- a/lib/uuid.c
+++ b/lib/uuid.c
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
--- a/mm/cleancache.c
+++ b/mm/cleancache.c
--- a/mm/shmem.c
+++ b/mm/shmem.c
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
--- a/sound/soc/intel/skylake/skl-nhlt.c
+++ b/sound/soc/intel/skylake/skl-nhlt.c
--- a/tools/testing/nvdimm/test/iomap.c
+++ b/tools/testing/nvdimm/test/iomap.c
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
--- a/tools/testing/nvdimm/test/nfit_test.h
+++ b/tools/testing/nvdimm/test/nfit_test.h