Merge 4.4-rc2 into staging-next

We want those fixes in here to resolve merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2026-09-26 18:16:26 +00:00 · 2015-11-23 14:51:50 -08:00 · 2015-11-23 14:51:50 -08:00 · 7f60809750
commit 7f60809750
parent b26baffbc9 1ec218373b
334 changed files with 4149 additions and 5497 deletions
--- a/Documentation/IPMI.txt
+++ b/Documentation/IPMI.txt
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/40
+++ b/40
--- a/2
+++ b/2
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
--- a/arch/arm64/crypto/aes-ce-cipher.c
+++ b/arch/arm64/crypto/aes-ce-cipher.c
--- a/arch/arm64/include/asm/barrier.h
+++ b/arch/arm64/include/asm/barrier.h
--- a/arch/arm64/include/asm/compat.h
+++ b/arch/arm64/include/asm/compat.h
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
--- a/arch/arm64/include/asm/mmu_context.h
+++ b/arch/arm64/include/asm/mmu_context.h
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
--- a/arch/arm64/kernel/suspend.c
+++ b/arch/arm64/kernel/suspend.c
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
--- a/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/arch/mips/boot/dts/qca/ar9132.dtsi
--- a/arch/mips/include/asm/page.h
+++ b/arch/mips/include/asm/page.h
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
--- a/arch/parisc/include/asm/hugetlb.h
+++ b/arch/parisc/include/asm/hugetlb.h
--- a/arch/parisc/include/asm/page.h
+++ b/arch/parisc/include/asm/page.h
--- a/arch/parisc/include/asm/pgalloc.h
+++ b/arch/parisc/include/asm/pgalloc.h
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
--- a/arch/parisc/include/uapi/asm/mman.h
+++ b/arch/parisc/include/uapi/asm/mman.h
--- a/arch/parisc/kernel/asm-offsets.c
+++ b/arch/parisc/kernel/asm-offsets.c
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
--- a/arch/parisc/mm/Makefile
+++ b/arch/parisc/mm/Makefile
--- a/arch/parisc/mm/hugetlbpage.c
+++ b/arch/parisc/mm/hugetlbpage.c
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
--- a/arch/powerpc/include/uapi/asm/unistd.h
+++ b/arch/powerpc/include/uapi/asm/unistd.h
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
--- a/arch/s390/include/asm/ipl.h
+++ b/arch/s390/include/asm/ipl.h
--- a/arch/s390/include/asm/pci_dma.h
+++ b/arch/s390/include/asm/pci_dma.h
--- a/arch/s390/include/asm/trace/diag.h
+++ b/arch/s390/include/asm/trace/diag.h
--- a/arch/s390/include/uapi/asm/unistd.h
+++ b/arch/s390/include/uapi/asm/unistd.h
--- a/arch/s390/kernel/compat_wrapper.c
+++ b/arch/s390/kernel/compat_wrapper.c
--- a/arch/s390/kernel/diag.c
+++ b/arch/s390/kernel/diag.c
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
--- a/arch/s390/kernel/sclp.c
+++ b/arch/s390/kernel/sclp.c
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
--- a/arch/s390/kernel/trace.c
+++ b/arch/s390/kernel/trace.c
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
--- a/arch/s390/mm/mmap.c
+++ b/arch/s390/mm/mmap.c
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
--- a/arch/x86/kernel/fpu/signal.c
+++ b/arch/x86/kernel/fpu/signal.c
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
--- a/arch/x86/kernel/mcount_64.S
+++ b/arch/x86/kernel/mcount_64.S
--- a/arch/x86/mm/mpx.c
+++ b/arch/x86/mm/mpx.c
--- a/block/blk.h
+++ b/block/blk.h
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
--- a/drivers/base/power/wakeirq.c
+++ b/drivers/base/power/wakeirq.c
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
--- a/drivers/clocksource/fsl_ftm_timer.c
+++ b/drivers/clocksource/fsl_ftm_timer.c
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
--- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
--- a/drivers/dma/at_hdmac_regs.h
+++ b/drivers/dma/at_hdmac_regs.h
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
--- a/drivers/dma/sh/usb-dmac.c
+++ b/drivers/dma/sh/usb-dmac.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
--- a/Show more
+++ b/Show more