Merge 4.20-rc4 into tty-next

We need the gsps fixes in here for some other serdev patches we will be merging into this branch. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2026-11-13 07:31:07 +00:00 · 2018-11-27 15:47:52 +01:00 · 2018-11-27 15:47:52 +01:00 · dc93967b80
commit dc93967b80
parent 8341f2f222 2e6e902d18
419 changed files with 4263 additions and 2555 deletions
--- a/8
+++ b/8
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
--- a/Documentation/admin-guide/pm/cpufreq.rst
+++ b/Documentation/admin-guide/pm/cpufreq.rst
--- a/Documentation/admin-guide/security-bugs.rst
+++ b/Documentation/admin-guide/security-bugs.rst
--- a/Documentation/core-api/xarray.rst
+++ b/Documentation/core-api/xarray.rst
--- a/Documentation/cpu-freq/cpufreq-stats.txt
+++ b/Documentation/cpu-freq/cpufreq-stats.txt
--- a/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt
+++ b/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt
--- a/Documentation/devicetree/bindings/net/can/holt_hi311x.txt
+++ b/Documentation/devicetree/bindings/net/can/holt_hi311x.txt
--- a/Documentation/devicetree/bindings/net/can/rcar_can.txt
+++ b/Documentation/devicetree/bindings/net/can/rcar_can.txt
--- a/Documentation/devicetree/bindings/net/dsa/dsa.txt
+++ b/Documentation/devicetree/bindings/net/dsa/dsa.txt
--- a/Documentation/input/event-codes.rst
+++ b/Documentation/input/event-codes.rst
--- a/Documentation/media/uapi/v4l/dev-meta.rst
+++ b/Documentation/media/uapi/v4l/dev-meta.rst
--- a/Documentation/media/uapi/v4l/vidioc-g-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-fmt.rst
--- a/Documentation/networking/rxrpc.txt
+++ b/Documentation/networking/rxrpc.txt
--- a/53
+++ b/53
--- a/4
+++ b/4
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
--- a/arch/arm/include/asm/proc-fns.h
+++ b/arch/arm/include/asm/proc-fns.h
--- a/arch/arm/kernel/bugs.c
+++ b/arch/arm/kernel/bugs.c
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
--- a/arch/arm/mm/proc-v7-bugs.c
+++ b/arch/arm/mm/proc-v7-bugs.c
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
--- a/arch/mips/configs/cavium_octeon_defconfig
+++ b/arch/mips/configs/cavium_octeon_defconfig
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
--- a/arch/mips/loongson64/loongson-3/numa.c
+++ b/arch/mips/loongson64/loongson-3/numa.c
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
--- a/arch/parisc/include/asm/spinlock.h
+++ b/arch/parisc/include/asm/spinlock.h
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
--- a/arch/powerpc/kvm/trace.h
+++ b/arch/powerpc/kvm/trace.h
--- a/arch/powerpc/kvm/trace_booke.h
+++ b/arch/powerpc/kvm/trace_booke.h
--- a/arch/powerpc/kvm/trace_hv.h
+++ b/arch/powerpc/kvm/trace_hv.h
--- a/arch/powerpc/kvm/trace_pr.h
+++ b/arch/powerpc/kvm/trace_pr.h
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
--- a/arch/powerpc/platforms/powernv/npu-dma.c
+++ b/arch/powerpc/platforms/powernv/npu-dma.c
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
--- a/arch/riscv/boot/.gitignore
+++ b/arch/riscv/boot/.gitignore
--- a/arch/riscv/boot/Makefile
+++ b/arch/riscv/boot/Makefile
--- a/arch/riscv/boot/install.sh
+++ b/arch/riscv/boot/install.sh
--- a/arch/riscv/configs/defconfig
+++ b/arch/riscv/configs/defconfig
--- a/arch/riscv/include/asm/module.h
+++ b/arch/riscv/include/asm/module.h
--- a/arch/riscv/include/asm/ptrace.h
+++ b/arch/riscv/include/asm/ptrace.h
--- a/arch/riscv/include/asm/uaccess.h
+++ b/arch/riscv/include/asm/uaccess.h
--- a/arch/riscv/include/asm/unistd.h
+++ b/arch/riscv/include/asm/unistd.h
--- a/arch/riscv/include/uapi/asm/syscalls.h
+++ b/arch/riscv/include/uapi/asm/syscalls.h
--- a/arch/riscv/kernel/cpu.c
+++ b/arch/riscv/kernel/cpu.c
--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
--- a/arch/riscv/kernel/module.c
+++ b/arch/riscv/kernel/module.c
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
--- a/arch/x86/events/intel/uncore.h
+++ b/arch/x86/events/intel/uncore.h
--- a/arch/x86/events/intel/uncore_snb.c
+++ b/arch/x86/events/intel/uncore_snb.c
--- a/arch/xtensa/include/asm/processor.h
+++ b/arch/xtensa/include/asm/processor.h
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
--- a/block/bio.c
+++ b/block/bio.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
--- a/block/bounce.c
+++ b/block/bounce.c
--- a/crypto/crypto_user_base.c
+++ b/crypto/crypto_user_base.c
--- a/crypto/crypto_user_stat.c
+++ b/crypto/crypto_user_stat.c
--- a/crypto/simd.c
+++ b/crypto/simd.c
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
--- a/drivers/cpufreq/ti-cpufreq.c
+++ b/drivers/cpufreq/ti-cpufreq.c
--- a/drivers/cpuidle/cpuidle-arm.c
+++ b/drivers/cpuidle/cpuidle-arm.c
--- a/drivers/crypto/hisilicon/sec/sec_algs.c
+++ b/drivers/crypto/hisilicon/sec/sec_algs.c
--- a/drivers/dma-buf/udmabuf.c
+++ b/drivers/dma-buf/udmabuf.c
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
--- a/drivers/firmware/efi/libstub/arm-stub.c
+++ b/drivers/firmware/efi/libstub/arm-stub.c
--- a/drivers/firmware/efi/libstub/fdt.c
+++ b/drivers/firmware/efi/libstub/fdt.c
--- a/drivers/firmware/efi/memmap.c
+++ b/drivers/firmware/efi/memmap.c
--- a/drivers/firmware/efi/runtime-wrappers.c
+++ b/drivers/firmware/efi/runtime-wrappers.c
--- a/drivers/gnss/serial.c
+++ b/drivers/gnss/serial.c
--- a/drivers/gnss/sirf.c
+++ b/drivers/gnss/sirf.c
--- a/drivers/gpio/gpio-mockup.c
+++ b/drivers/gpio/gpio-mockup.c
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
--- a/Show more
+++ b/Show more