Merge tag 'v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994958AbdEMXTqJBTnF/[email protected]> |
Author: Ralf Baechle <[email protected]> Sat May 13 23:57:15 2017 +0200 Commit: 491628e100581ebe6f4fdef530fd8690f1180abb Gitweb: https://git.linux-mips.org/g/ralf/linux/491628e10058 Branch: master --- .mailmap | 2 Documentation/cgroup-v2.txt | 12 .../bindings/power/supply/axp20x_battery.txt | 20 .../bindings/powerpc/ibm,powerpc-cpu-features.txt | 248 + .../devicetree/bindings/soc/fsl/cpm_qe/gpio.txt | 21 .../bindings/thermal/brcm,bcm2835-thermal.txt | 32 .../devicetree/bindings/thermal/brcm,ns-thermal | 37 .../devicetree/bindings/thermal/da9062-thermal.txt | 36 Documentation/filesystems/bfs.txt | 2 Documentation/target/target-export-device | 80 Documentation/thermal/sysfs-api.txt | 21 Documentation/x86/intel_rdt_ui.txt | 2 MAINTAINERS | 4 Makefile | 4 arch/mips/Kbuild | 2 arch/mips/Kconfig | 24 arch/mips/cavium-octeon/Kconfig | 9 arch/mips/cavium-octeon/Platform | 4 arch/mips/cavium-octeon/executive/cvmx-l2c.c | 139 - arch/mips/cavium-octeon/executive/octeon-model.c | 21 arch/mips/cavium-octeon/octeon-platform.c | 113 - arch/mips/cavium-octeon/setup.c | 12 arch/mips/configs/generic_defconfig | 3 arch/mips/include/asm/cache.h | 5 arch/mips/include/asm/cpu-info.h | 3 arch/mips/include/asm/cpufeature.h | 26 .../include/asm/mach-rm/cpu-feature-overrides.h | 2 arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 3193 +----------------- arch/mips/include/asm/octeon/cvmx-l2c.h | 59 arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 526 --- arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 286 +- arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 3225 +----------------- arch/mips/include/asm/octeon/cvmx-sli-defs.h | 3541 -------------------- arch/mips/include/asm/octeon/cvmx.h | 3 arch/mips/include/asm/pgalloc.h | 26 arch/mips/include/asm/pgtable-64.h | 88 arch/mips/include/asm/uasm.h | 88 arch/mips/kernel/cpu-probe.c | 7 arch/mips/kernel/mips-r2-to-r6-emul.c | 16 arch/mips/kernel/process.c | 6 arch/mips/kernel/r4k_switch.S | 6 arch/mips/kernel/smp-cps.c | 7 arch/mips/kernel/smp-mt.c | 49 arch/mips/kernel/smp.c | 20 arch/mips/lantiq/irq.c | 52 arch/mips/math-emu/cp1emu.c | 10 arch/mips/mm/fault.c | 16 arch/mips/mm/init.c | 3 arch/mips/mm/pgtable-64.c | 33 arch/mips/mm/tlbex.c | 22 arch/mips/mm/uasm-mips.c | 1 arch/mips/mm/uasm.c | 159 - arch/mips/mti-malta/malta-int.c | 83 arch/mips/net/bpf_jit.c | 41 arch/mips/net/bpf_jit_asm.S | 23 arch/mips/pci/pcie-octeon.c | 4 arch/nios2/Kconfig | 2 arch/nios2/Kconfig.debug | 1 arch/nios2/Makefile | 5 arch/nios2/boot/.gitignore | 2 arch/nios2/boot/dts/10m50_devboard.dts | 3 arch/nios2/include/asm/Kbuild | 1 arch/nios2/include/asm/cacheflush.h | 6 arch/nios2/include/asm/cmpxchg.h | 14 arch/nios2/include/asm/cpuinfo.h | 2 arch/nios2/include/asm/prom.h | 22 arch/nios2/include/asm/setup.h | 2 arch/nios2/include/asm/uaccess.h | 7 arch/nios2/kernel/.gitignore | 1 arch/nios2/kernel/Makefile | 1 arch/nios2/kernel/cpuinfo.c | 18 arch/nios2/kernel/early_printk.c | 118 - arch/nios2/kernel/irq.c | 2 arch/nios2/kernel/prom.c | 49 arch/nios2/kernel/setup.c | 6 arch/nios2/mm/uaccess.c | 33 arch/nios2/platform/Kconfig.platform | 26 arch/powerpc/Kconfig | 16 arch/powerpc/Makefile.postlink | 2 arch/powerpc/include/asm/book3s/64/hash-64k.h | 6 arch/powerpc/include/asm/cpm1.h | 2 arch/powerpc/include/asm/cpu_has_feature.h | 6 arch/powerpc/include/asm/cputable.h | 2 arch/powerpc/include/asm/dt_cpu_ftrs.h | 26 arch/powerpc/include/asm/processor.h | 5 arch/powerpc/include/asm/reg.h | 1 arch/powerpc/include/uapi/asm/cputable.h | 7 arch/powerpc/kernel/Makefile | 1 arch/powerpc/kernel/cputable.c | 37 arch/powerpc/kernel/dt_cpu_ftrs.c | 1031 ++++++ arch/powerpc/kernel/exceptions-64e.S | 12 arch/powerpc/kernel/exceptions-64s.S | 4 arch/powerpc/kernel/prom.c | 29 arch/powerpc/kernel/setup-common.c | 2 arch/powerpc/kernel/setup_64.c | 10 arch/powerpc/platforms/powernv/eeh-powernv.c | 3 arch/powerpc/sysdev/cpm1.c | 25 arch/um/Kconfig.common | 5 arch/um/kernel/initrd.c | 4 arch/um/kernel/sysrq.c | 6 arch/um/kernel/um_arch.c | 6 arch/um/os-Linux/skas/process.c | 4 arch/x86/Makefile | 3 arch/x86/boot/compressed/error.h | 4 arch/x86/boot/compressed/pagetable.c | 2 arch/x86/events/intel/rapl.c | 2 arch/x86/include/asm/asm.h | 1 arch/x86/include/asm/init.h | 3 arch/x86/include/asm/pmem.h | 2 arch/x86/kernel/cpu/amd.c | 5 arch/x86/kernel/cpu/microcode/amd.c | 4 arch/x86/kernel/cpu/microcode/core.c | 2 arch/x86/kernel/cpu/microcode/intel.c | 2 arch/x86/kernel/machine_kexec_64.c | 6 arch/x86/kernel/setup.c | 15 arch/x86/kernel/setup_percpu.c | 10 arch/x86/lib/csum-copy_64.S | 12 arch/x86/lib/kaslr.c | 3 arch/x86/mm/ident_map.c | 14 arch/x86/mm/init_64.c | 12 arch/x86/mm/numa_32.c | 1 arch/x86/power/hibernate_64.c | 2 arch/x86/um/ptrace_64.c | 2 arch/x86/um/shared/sysdep/kernel-offsets.h | 9 arch/x86/xen/enlighten_pv.c | 42 arch/x86/xen/mmu_pv.c | 7 arch/x86/xen/time.c | 2 block/Kconfig | 1 drivers/clocksource/arm_arch_timer.c | 2 drivers/cpufreq/loongson2_cpufreq.c | 7 drivers/dax/Kconfig | 7 drivers/dax/super.c | 81 drivers/gpu/drm/amd/amdgpu/amdgpu.h | 16 drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 6 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 20 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 13 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 208 - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 3 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 104 - drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 140 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 68 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 9 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 5 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 21 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 15 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 12 drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 229 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 18 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 37 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 36 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 10 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 14 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 46 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 155 - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 21 drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 30 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 13 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 10 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 12 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 22 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 517 +-- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 5 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 23 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 drivers/gpu/drm/amd/amdgpu/mmsch_v1_0.h | 57 drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 9 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 86 drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 4 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 222 + drivers/gpu/drm/amd/amdgpu/soc15.c | 9 drivers/gpu/drm/amd/amdgpu/soc15_common.h | 20 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 466 ++- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 224 - drivers/gpu/drm/amd/include/amd_shared.h | 6 drivers/gpu/drm/amd/include/cgs_common.h | 270 -- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 4 .../drm/amd/powerplay/eventmgr/eventsubchains.c | 2 .../gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 5 .../gpu/drm/amd/powerplay/eventmgr/eventtasks.h | 1 .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 10 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 49 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 39 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 64 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 9 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 2 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 408 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 3 .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 27 .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.h | 1 .../amd/powerplay/hwmgr/vega10_processpptables.c | 4 .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 80 .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 2 .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 4 drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h | 18 drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 5 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 226 + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 2 drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 23 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 2 drivers/gpu/drm/drm_edid.c | 8 drivers/gpu/drm/i915/Kconfig.debug | 13 drivers/gpu/drm/i915/intel_sprite.c | 7 drivers/gpu/drm/nouveau/nv50_display.c | 29 drivers/gpu/drm/nouveau/nvkm/core/object.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c | 1 drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c | 2 drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c | 59 drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv04.c | 2 drivers/gpu/drm/radeon/cik.c | 29 drivers/gpu/drm/radeon/evergreen.c | 18 drivers/gpu/drm/radeon/r420.c | 8 drivers/gpu/drm/radeon/radeon_cs.c | 10 drivers/gpu/drm/radeon/radeon_object.c | 2 drivers/gpu/drm/radeon/radeon_test.c | 7 drivers/gpu/drm/radeon/radeon_uvd.c | 2 drivers/gpu/drm/radeon/si.c | 29 drivers/gpu/drm/ttm/ttm_bo.c | 3 drivers/infiniband/ulp/srpt/ib_srpt.c | 9 drivers/input/joystick/Kconfig | 21 drivers/input/joystick/Makefile | 1 drivers/input/joystick/psxpad-spi.c | 401 ++ drivers/input/joystick/xpad.c | 27 drivers/input/keyboard/cros_ec_keyb.c | 2 drivers/irqchip/Kconfig | 2 drivers/irqchip/irq-mips-cpu.c | 146 + drivers/mtd/ubi/build.c | 10 drivers/mtd/ubi/debug.c | 126 + drivers/mtd/ubi/fastmap.c | 33 drivers/net/ethernet/freescale/ucc_geth.c | 8 drivers/nvdimm/blk.c | 3 drivers/nvdimm/btt.c | 119 - drivers/nvdimm/btt_devs.c | 2 drivers/nvdimm/claim.c | 6 drivers/nvdimm/nd.h | 1 drivers/nvdimm/pfn_devs.c | 4 drivers/of/fdt.c | 38 drivers/power/supply/Kconfig | 27 drivers/power/supply/Makefile | 1 drivers/power/supply/ab8500_charger.c | 2 drivers/power/supply/axp20x_battery.c | 502 +++ drivers/power/supply/bq24190_charger.c | 149 + drivers/power/supply/cpcap-charger.c | 11 drivers/power/supply/generic-adc-battery.c | 17 drivers/power/supply/isp1704_charger.c | 4 drivers/power/supply/max17042_battery.c | 181 + drivers/power/supply/pda_power.c | 49 drivers/power/supply/power_supply_core.c | 20 drivers/power/supply/rx51_battery.c | 1 drivers/power/supply/sbs-battery.c | 57 drivers/power/supply/twl4030_charger.c | 95 - drivers/power/supply/twl4030_madc_battery.c | 1 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 114 + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 2 drivers/soc/fsl/qbman/qman.c | 5 drivers/soc/fsl/qe/qe.c | 25 drivers/soc/fsl/qe/qe_tdm.c | 2 drivers/target/iscsi/iscsi_target.c | 51 drivers/target/iscsi/iscsi_target_configfs.c | 1 drivers/target/iscsi/iscsi_target_login.c | 1 drivers/target/target_core_configfs.c | 54 drivers/target/target_core_device.c | 38 drivers/target/target_core_file.c | 32 drivers/target/target_core_iblock.c | 12 drivers/target/target_core_iblock.h | 3 drivers/target/target_core_pr.c | 2 drivers/target/target_core_pr.h | 9 drivers/target/target_core_pscsi.c | 3 drivers/target/target_core_rd.c | 50 drivers/target/target_core_sbc.c | 10 drivers/target/target_core_tpg.c | 7 drivers/target/target_core_transport.c | 2 drivers/target/target_core_user.c | 645 +++- drivers/thermal/Kconfig | 32 drivers/thermal/Makefile | 2 drivers/thermal/broadcom/Kconfig | 16 drivers/thermal/broadcom/Makefile | 2 drivers/thermal/broadcom/bcm2835_thermal.c | 314 ++ drivers/thermal/broadcom/ns-thermal.c | 106 + drivers/thermal/da9062-thermal.c | 315 ++ drivers/thermal/devfreq_cooling.c | 152 + drivers/thermal/intel_soc_dts_thermal.c | 9 drivers/thermal/mtk_thermal.c | 2 drivers/thermal/rcar_gen3_thermal.c | 199 + drivers/thermal/thermal_core.c | 64 .../thermal/ti-soc-thermal/dra752-thermal-data.c | 10 .../thermal/ti-soc-thermal/omap3-thermal-data.c | 4 .../thermal/ti-soc-thermal/omap4-thermal-data.c | 6 .../thermal/ti-soc-thermal/omap5-thermal-data.c | 4 drivers/thermal/ti-soc-thermal/ti-bandgap.h | 4 drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 158 - drivers/thermal/ti-soc-thermal/ti-thermal.h | 16 fs/Kconfig | 1 fs/bfs/inode.c | 4 fs/block_dev.c | 66 fs/dax.c | 95 - fs/ext2/super.c | 1 fs/ext4/file.c | 21 fs/ext4/super.c | 1 fs/namei.c | 48 fs/namespace.c | 18 fs/open.c | 9 fs/ubifs/Kconfig | 13 fs/ubifs/debug.c | 4 fs/ubifs/ioctl.c | 6 fs/ubifs/recovery.c | 1 fs/ubifs/ubifs.h | 14 fs/ubifs/xattr.c | 6 fs/xfs/xfs_super.c | 1 include/linux/blkdev.h | 2 include/linux/dax.h | 31 include/linux/devfreq_cooling.h | 19 include/linux/fs.h | 1 include/linux/namei.h | 1 include/linux/nd.h | 12 include/linux/of_fdt.h | 6 include/linux/power/max17042_battery.h | 9 include/linux/vmalloc.h | 21 include/scsi/scsi_proto.h | 1 include/soc/fsl/qe/immap_qe.h | 19 include/soc/fsl/qe/qe.h | 1 include/target/target_core_backend.h | 1 include/target/target_core_base.h | 1 include/trace/events/thermal.h | 11 include/uapi/drm/amdgpu_drm.h | 24 kernel/events/callchain.c | 6 kernel/fork.c | 2 kernel/gcov/base.c | 6 kernel/gcov/gcc_4_7.c | 4 kernel/time/time.c | 14 mm/khugepaged.c | 11 mm/memcontrol.c | 2 mm/memory-failure.c | 7 mm/truncate.c | 21 mm/util.c | 3 mm/vmalloc.c | 19 mm/vmscan.c | 21 mm/vmstat.c | 2 sound/Kconfig | 1 sound/hda/hdac_controller.c | 4 sound/pci/hda/patch_conexant.c | 4 tools/build/feature/test-sched_getcpu.c | 2 tools/include/linux/string.h | 2 tools/lib/string.c | 9 tools/lib/subcmd/help.c | 1 tools/lib/subcmd/parse-options.c | 1 tools/lib/subcmd/subcmd-util.h | 9 tools/perf/Documentation/perf-c2c.txt | 4 tools/perf/Documentation/perf-record.txt | 2 tools/perf/Documentation/perf-report.txt | 6 tools/perf/Documentation/perf.data-file-format.txt | 4 tools/perf/Documentation/tips.txt | 2 tools/perf/arch/arm64/annotate/instructions.c | 2 tools/perf/arch/powerpc/util/sym-handling.c | 12 tools/perf/builtin-buildid-cache.c | 13 tools/perf/builtin-c2c.c | 1 tools/perf/builtin-config.c | 19 tools/perf/builtin-top.c | 2 tools/perf/builtin-trace.c | 1 tools/perf/perf.c | 1 tools/perf/tests/hists_cumulate.c | 1 tools/perf/tests/hists_filter.c | 1 tools/perf/tests/hists_output.c | 1 tools/perf/tests/kmod-path.c | 2 tools/perf/tests/sdt.c | 1 tools/perf/ui/setup.c | 3 tools/perf/util/Build | 1 tools/perf/util/build-id.h | 4 tools/perf/util/event.c | 10 tools/perf/util/event.h | 14 tools/perf/util/evsel.c | 1 tools/perf/util/header.c | 1 tools/perf/util/intel-pt.c | 1 tools/perf/util/machine.c | 28 tools/perf/util/map.c | 5 tools/perf/util/map.h | 5 tools/perf/util/memswap.c | 24 tools/perf/util/memswap.h | 7 .../perf/util/scripting-engines/trace-event-perl.c | 4 tools/perf/util/session.c | 1 tools/perf/util/strbuf.c | 9 tools/perf/util/symbol.c | 72 tools/perf/util/symbol.h | 11 tools/perf/util/units.c | 29 tools/perf/util/units.h | 7 tools/perf/util/util.c | 49 tools/perf/util/util.h | 26 408 files changed, 9807 insertions(+), 14601 deletions(-)