Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Sat, 30 Jun 2018 15:22:52 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23990406AbeF3NWyl1vlE/[email protected]> |
Author: Ralf Baechle <[email protected]> Sat Jun 30 15:21:13 2018 +0200 Commit: d0ab78545f6adcf2bfed376f459c37accd7110cc Gitweb: https://git.linux-mips.org/g/ralf/linux/d0ab78545f6a Branch: master --- Documentation/admin-guide/pm/intel_pstate.rst | 14 +++++- arch/arm/Kconfig | 8 +++ arch/arm/mach-bcm/Kconfig | 1 arch/arm/mach-socfpga/Kconfig | 1 arch/arm64/include/asm/alternative.h | 7 ++- arch/arm64/include/asm/pgtable.h | 6 -- arch/arm64/kernel/alternative.c | 51 ++++++++++++++++++--- arch/arm64/kernel/module.c | 5 +- arch/powerpc/include/asm/book3s/32/pgalloc.h | 1 arch/powerpc/include/asm/nohash/32/pgalloc.h | 1 arch/powerpc/include/asm/systbl.h | 1 arch/powerpc/include/asm/unistd.h | 2 - arch/powerpc/include/uapi/asm/unistd.h | 1 arch/powerpc/platforms/powermac/time.c | 29 ++++++++---- drivers/base/power/domain.c | 7 +-- drivers/cpufreq/qcom-cpufreq-kryo.c | 8 ++- drivers/dax/super.c | 8 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 33 +++++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 ++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 +++---- drivers/gpu/drm/arm/malidp_drv.c | 3 + drivers/gpu/drm/arm/malidp_hw.c | 3 + drivers/gpu/drm/arm/malidp_planes.c | 9 ++-- drivers/gpu/drm/meson/meson_drv.c | 12 +++-- drivers/i2c/algos/i2c-algo-bit.c | 8 ++- drivers/i2c/busses/i2c-gpio.c | 4 +- drivers/i2c/i2c-core-smbus.c | 14 ++++-- drivers/md/dm-raid.c | 2 - drivers/md/dm-table.c | 7 ++- drivers/md/dm-thin-metadata.c | 9 ---- drivers/md/dm-thin.c | 11 ++++- drivers/md/dm-writecache.c | 10 ++-- drivers/md/dm-zoned-target.c | 2 - drivers/md/dm.c | 8 +-- drivers/nvdimm/pmem.c | 3 + drivers/pci/Makefile | 6 +- drivers/pci/controller/Kconfig | 3 - drivers/pci/hotplug/acpi_pcihp.c | 10 ++++ drivers/perf/xgene_pmu.c | 2 - fs/ceph/inode.c | 1 include/linux/pm_domain.h | 6 +- include/uapi/linux/aio_abi.h | 2 - net/socket.c | 2 + 44 files changed, 231 insertions(+), 116 deletions(-)