Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992942AbcLWNRgLAL-t/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Dec 23 14:15:23 2016 +0100 Commit: cbaf933b4005b498f42649b914ad1696970f709b Gitweb: https://git.linux-mips.org/g/ralf/linux/cbaf933b4005 Branch: master --- CREDITS | 2 Documentation/ABI/testing/sysfs-devices-system-cpu | 16 .../devicetree/bindings/mmc/sdhci-cadence.txt | 6 Documentation/x86/intel_rdt_ui.txt | 214 ++++ MAINTAINERS | 12 arch/arm64/include/asm/acpi.h | 2 arch/arm64/kernel/acpi.c | 7 arch/x86/Kconfig | 13 arch/x86/events/intel/cqm.c | 23 arch/x86/include/asm/cpufeatures.h | 4 arch/x86/include/asm/intel_rdt.h | 224 ++++ arch/x86/include/asm/intel_rdt_common.h | 27 arch/x86/kernel/cpu/Makefile | 2 arch/x86/kernel/cpu/intel_cacheinfo.c | 20 arch/x86/kernel/cpu/intel_rdt.c | 403 +++++++ arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 1115 ++++++++++++++++++++ arch/x86/kernel/cpu/intel_rdt_schemata.c | 245 ++++ arch/x86/kernel/cpu/scattered.c | 11 arch/x86/kernel/process_32.c | 4 arch/x86/kernel/process_64.c | 4 block/ioctl.c | 3 block/scsi_ioctl.c | 3 drivers/acpi/acpica/actables.h | 6 drivers/acpi/acpica/tbfadt.c | 14 drivers/acpi/acpica/tbutils.c | 85 ++ drivers/acpi/acpica/tbxface.c | 130 +- drivers/acpi/bus.c | 2 drivers/acpi/nfit/core.c | 3 drivers/acpi/osl.c | 15 drivers/acpi/processor_core.c | 8 drivers/acpi/scan.c | 3 drivers/acpi/spcr.c | 8 drivers/acpi/tables.c | 17 drivers/base/cacheinfo.c | 5 drivers/cpufreq/acpi-cpufreq.c | 2 drivers/cpufreq/s3c64xx-cpufreq.c | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 3 drivers/gpu/drm/radeon/radeon_bios.c | 3 drivers/iommu/amd_iommu_init.c | 10 drivers/iommu/dmar.c | 7 drivers/mailbox/pcc.c | 5 drivers/md/bcache/bcache.h | 4 drivers/md/bcache/btree.c | 39 - drivers/md/bcache/btree.h | 3 drivers/md/bcache/request.c | 4 drivers/md/bcache/super.c | 7 drivers/mmc/core/core.c | 12 drivers/mmc/core/sd.c | 12 drivers/mmc/host/sdhci-cadence.c | 1 drivers/mmc/host/sdhci.c | 33 - drivers/nvme/host/pci.c | 4 include/acpi/acpi_io.h | 2 include/acpi/acpixf.h | 17 include/acpi/actbl.h | 1 include/acpi/platform/aclinuxex.h | 1 include/linux/blkdev.h | 1 include/linux/cacheinfo.h | 3 include/linux/sched.h | 3 include/uapi/linux/magic.h | 1 scripts/selinux/genheaders/Makefile | 4 scripts/selinux/genheaders/genheaders.c | 4 scripts/selinux/mdp/Makefile | 4 scripts/selinux/mdp/mdp.c | 4 security/selinux/include/classmap.h | 2 64 files changed, 2641 insertions(+), 213 deletions(-)