Merge branch 'master' into next

Merge master back into next, this allows us to resolve some conflicts in arch/powerpc/Kconfig, and also re-sort the symbols under config PPC so that they are in alphabetical order again.
2026-11-13 07:31:07 +00:00 · 2021-05-08 21:12:55 +10:00 · 2021-05-08 21:12:55 +10:00 · f96271cefe
commit f96271cefe
parent 32b48bf851 dd860052c9
1333 changed files with 34108 additions and 14693 deletions
--- a/arch/alpha/include/asm/io.h
+++ b/arch/alpha/include/asm/io.h
--- a/arch/alpha/kernel/pc873xx.c
+++ b/arch/alpha/kernel/pc873xx.c
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
--- a/arch/arm/configs/footbridge_defconfig
+++ b/arch/arm/configs/footbridge_defconfig
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
--- a/arch/arm/configs/moxart_defconfig
+++ b/arch/arm/configs/moxart_defconfig
--- a/arch/arm/configs/mps2_defconfig
+++ b/arch/arm/configs/mps2_defconfig
--- a/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
--- a/arch/arm/configs/xcep_defconfig
+++ b/arch/arm/configs/xcep_defconfig
--- a/arch/arm/include/asm/bug.h
+++ b/arch/arm/include/asm/bug.h
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
--- a/arch/arm/include/asm/kexec.h
+++ b/arch/arm/include/asm/kexec.h
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
--- a/arch/arm/include/asm/set_memory.h
+++ b/arch/arm/include/asm/set_memory.h
--- a/arch/arm/include/uapi/asm/Kbuild
+++ b/arch/arm/include/uapi/asm/Kbuild
--- a/arch/arm/include/uapi/asm/unistd.h
+++ b/arch/arm/include/uapi/asm/unistd.h
--- a/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
--- a/arch/arm/kernel/smccc-call.S
+++ b/arch/arm/kernel/smccc-call.S
--- a/arch/arm/kernel/suspend.c
+++ b/arch/arm/kernel/suspend.c
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
--- a/arch/arm/mach-footbridge/Makefile
+++ b/arch/arm/mach-footbridge/Makefile
--- a/arch/arm/mach-footbridge/personal-pci.c
+++ b/arch/arm/mach-footbridge/personal-pci.c
--- a/arch/arm/mach-footbridge/personal.c
+++ b/arch/arm/mach-footbridge/personal.c
--- a/arch/arm/mach-iop32x/n2100.c
+++ b/arch/arm/mach-iop32x/n2100.c
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
--- a/arch/arm/mm/dump.c
+++ b/arch/arm/mm/dump.c
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
--- a/arch/arm/mm/ptdump_debugfs.c
+++ b/arch/arm/mm/ptdump_debugfs.c
--- a/arch/arm/probes/kprobes/test-arm.c
+++ b/arch/arm/probes/kprobes/test-arm.c
--- a/arch/arm/probes/kprobes/test-core.h
+++ b/arch/arm/probes/kprobes/test-core.h
--- a/arch/arm/tools/Makefile
+++ b/arch/arm/tools/Makefile
--- a/arch/arm/tools/syscallhdr.sh
+++ b/arch/arm/tools/syscallhdr.sh
--- a/arch/arm/tools/syscalltbl.sh
+++ b/arch/arm/tools/syscalltbl.sh
--- a/arch/arm/xen/mm.c
+++ b/arch/arm/xen/mm.c
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
--- a/arch/arm64/include/asm/daifflags.h
+++ b/arch/arm64/include/asm/daifflags.h
--- a/arch/arm64/include/asm/kernel-pgtable.h
+++ b/arch/arm64/include/asm/kernel-pgtable.h
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
--- a/arch/arm64/include/asm/sparsemem.h
+++ b/arch/arm64/include/asm/sparsemem.h
--- a/arch/arm64/kernel/alternative.c
+++ b/arch/arm64/kernel/alternative.c
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
--- a/arch/arm64/kernel/cpuidle.c
+++ b/arch/arm64/kernel/cpuidle.c
--- a/arch/arm64/kernel/entry-common.c
+++ b/arch/arm64/kernel/entry-common.c
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
--- a/arch/arm64/kernel/stacktrace.c
+++ b/arch/arm64/kernel/stacktrace.c
--- a/arch/arm64/kernel/vdso/vdso.lds.S
+++ b/arch/arm64/kernel/vdso/vdso.lds.S
--- a/arch/arm64/kernel/vdso32/Makefile
+++ b/arch/arm64/kernel/vdso32/Makefile
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
--- a/arch/arm64/mm/ptdump.c
+++ b/arch/arm64/mm/ptdump.c
--- a/arch/csky/include/asm/Kbuild
+++ b/arch/csky/include/asm/Kbuild
--- a/arch/csky/include/asm/asid.h
+++ b/arch/csky/include/asm/asid.h
--- a/arch/csky/include/asm/barrier.h
+++ b/arch/csky/include/asm/barrier.h
--- a/arch/csky/include/asm/segment.h
+++ b/arch/csky/include/asm/segment.h
--- a/arch/csky/include/asm/uaccess.h
+++ b/arch/csky/include/asm/uaccess.h
--- a/arch/csky/include/asm/vdso.h
+++ b/arch/csky/include/asm/vdso.h
--- a/arch/csky/kernel/entry.S
+++ b/arch/csky/kernel/entry.S
--- a/arch/csky/lib/usercopy.c
+++ b/arch/csky/lib/usercopy.c
--- a/arch/csky/mm/fault.c
+++ b/arch/csky/mm/fault.c
--- a/arch/csky/mm/syscache.c
+++ b/arch/csky/mm/syscache.c
--- a/arch/h8300/include/asm/bitops.h
+++ b/arch/h8300/include/asm/bitops.h
--- a/arch/hexagon/Makefile
+++ b/arch/hexagon/Makefile
--- a/arch/hexagon/configs/comet_defconfig
+++ b/arch/hexagon/configs/comet_defconfig
--- a/arch/hexagon/include/asm/futex.h
+++ b/arch/hexagon/include/asm/futex.h
--- a/arch/hexagon/include/asm/io.h
+++ b/arch/hexagon/include/asm/io.h
--- a/arch/hexagon/include/asm/timex.h
+++ b/arch/hexagon/include/asm/timex.h
--- a/arch/hexagon/kernel/hexagon_ksyms.c
+++ b/arch/hexagon/kernel/hexagon_ksyms.c
--- a/arch/hexagon/kernel/ptrace.c
+++ b/arch/hexagon/kernel/ptrace.c
--- a/arch/hexagon/lib/Makefile
+++ b/arch/hexagon/lib/Makefile
--- a/arch/hexagon/lib/divsi3.S
+++ b/arch/hexagon/lib/divsi3.S
--- a/arch/hexagon/lib/memcpy_likely_aligned.S
+++ b/arch/hexagon/lib/memcpy_likely_aligned.S
--- a/arch/hexagon/lib/modsi3.S
+++ b/arch/hexagon/lib/modsi3.S
--- a/arch/hexagon/lib/udivsi3.S
+++ b/arch/hexagon/lib/udivsi3.S
--- a/arch/hexagon/lib/umodsi3.S
+++ b/arch/hexagon/lib/umodsi3.S
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/include/asm/io.h
+++ b/arch/ia64/include/asm/io.h
--- a/arch/ia64/include/asm/uaccess.h
+++ b/arch/ia64/include/asm/uaccess.h
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
--- a/arch/m68k/atari/time.c
+++ b/arch/m68k/atari/time.c
--- a/arch/m68k/coldfire/intc-simr.c
+++ b/arch/m68k/coldfire/intc-simr.c
--- a/arch/m68k/configs/amcore_defconfig
+++ b/arch/m68k/configs/amcore_defconfig
--- a/arch/m68k/include/asm/bitops.h
+++ b/arch/m68k/include/asm/bitops.h
--- a/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h
--- a/arch/microblaze/include/asm/ftrace.h
+++ b/arch/microblaze/include/asm/ftrace.h
--- a/Show more
+++ b/Show more