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.
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-event_source-devices-dsa | 30 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-system-cpu | 2 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-input-exc3000 | 9 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-fs-f2fs | 31 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-kernel-mm-cma | 25 | |
| -rw-r--r-- | Documentation/admin-guide/devices.txt | 2 | |
| -rw-r--r-- | Documentation/admin-guide/gpio/gpio-mockup.rst | 11 | |
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 41 | |
| -rw-r--r-- | Documentation/admin-guide/mm/memory-hotplug.rst | 9 | |
| -rw-r--r-- | Documentation/admin-guide/mm/userfaultfd.rst | 107 | |
| -rw-r--r-- | Documentation/admin-guide/reporting-issues.rst | 49 | |
| -rw-r--r-- | Documentation/arm64/booting.rst | 33 | |
| -rw-r--r-- | Documentation/arm64/elf_hwcaps.rst | 2 | |
| -rw-r--r-- | Documentation/arm64/tagged-address-abi.rst | 6 | |
| -rw-r--r-- | Documentation/core-api/dma-api.rst | 88 | |
| -rw-r--r-- | Documentation/core-api/irq/irq-domain.rst | 22 | |
| -rw-r--r-- | Documentation/core-api/symbol-namespaces.rst | 26 | |
| -rw-r--r-- | Documentation/dev-tools/gdb-kernel-debugging.rst | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/renesas,du.yaml | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/dma/qcom,gpi.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/fairchild,74hc595.yaml | 77 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-74x164.txt | 27 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/realtek,otto-gpio.yaml | 78 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml | 82 | |
| -rw-r--r-- | Documentation/devicetree/bindings/hwlock/sirf,hwspinlock.txt | 28 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/atmel,maxtouch.yaml | 32 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/iqs626a.yaml | 843 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs5xx.yaml | 75 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/hycon,hy46xx.yaml | 119 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/ilitek_ts_i2c.yaml | 73 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt | 80 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/melfas,mms114.yaml | 87 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/mms114.txt | 42 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/mstar,msg2638.yaml | 69 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/idt,32434-pic.yaml | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/leds/leds-rt4505.yaml | 57 | |
| -rw-r--r-- | Documentation/devicetree/bindings/media/renesas,vin.yaml | 46 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/tango-nand.txt | 38 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/renesas,etheravb.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/hisilicon-pcie.txt | 43 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml | 181 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/rcar-pci-host.yaml | 12 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml | 113 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/tango-pcie.txt | 29 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/ti,j721e-pci-host.yaml | 20 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/xilinx-nwl-pcie.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt | 58 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/pwm-rockchip.txt | 27 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/pwm-rockchip.yaml | 100 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/toshiba,pwm-visconti.yaml | 43 | |
| -rw-r--r-- | Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml | 90 | |
| -rw-r--r-- | Documentation/devicetree/bindings/remoteproc/imx-rproc.txt | 33 | |
| -rw-r--r-- | Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt | 15 | |
| -rw-r--r-- | Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/riscv/microchip.yaml | 27 | |
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 62 | |
| -rw-r--r-- | Documentation/devicetree/bindings/serial/8250.yaml | 5 | |
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/brcm,ns-thermal.txt | 37 | |
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/brcm,ns-thermal.yaml | 60 | |
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 59 | |
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml | 43 | |
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/thermal-sensor.yaml | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 | |
| -rw-r--r-- | Documentation/driver-api/gpio/consumer.rst | 2 | |
| -rw-r--r-- | Documentation/driver-api/gpio/drivers-on-gpio.rst | 6 | |
| -rw-r--r-- | Documentation/driver-api/pwm.rst | 6 | |
| -rw-r--r-- | Documentation/driver-api/thermal/sysfs-api.rst | 12 | |
| -rw-r--r-- | Documentation/driver-api/vfio.rst | 2 | |
| -rw-r--r-- | Documentation/filesystems/f2fs.rst | 14 | |
| -rw-r--r-- | Documentation/firmware-guide/acpi/gpio-properties.rst | 6 | |
| -rw-r--r-- | Documentation/input/devices/rotary-encoder.rst | 8 | |
| -rw-r--r-- | Documentation/input/joydev/joystick-api.rst | 14 | |
| -rw-r--r-- | Documentation/input/joydev/joystick.rst | 26 | |
| -rw-r--r-- | Documentation/process/changes.rst | 1 | |
| -rw-r--r-- | Documentation/riscv/index.rst | 1 | |
| -rw-r--r-- | Documentation/riscv/vm-layout.rst | 63 | |
| -rw-r--r-- | Documentation/translations/it_IT/process/changes.rst | 1 | |
| -rw-r--r-- | Documentation/translations/zh_CN/index.rst | 168 | |
| -rw-r--r-- | Documentation/x86/x86_64/5level-paging.rst | 4 | |
| -rw-r--r-- | MAINTAINERS | 43 | |
| -rw-r--r-- | arch/alpha/include/asm/io.h | 5 | |
| -rw-r--r-- | arch/alpha/kernel/pc873xx.c | 4 | |
| -rw-r--r-- | arch/alpha/lib/csum_partial_copy.c | 1 | |
| -rw-r--r-- | arch/arc/Kconfig | 9 | |
| -rw-r--r-- | arch/arm/Kconfig | 10 | |
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/rk3036.dtsi | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/rk3288.dtsi | 4 | |
| -rw-r--r-- | arch/arm/configs/dove_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/footbridge_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/magician_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/moxart_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/mps2_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/mvebu_v5_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/xcep_defconfig | 1 | |
| -rw-r--r-- | arch/arm/include/asm/bug.h | 1 | |
| -rw-r--r-- | arch/arm/include/asm/io.h | 5 | |
| -rw-r--r-- | arch/arm/include/asm/kexec.h | 3 | |
| -rw-r--r-- | arch/arm/include/asm/memory.h | 15 | |
| -rw-r--r-- | arch/arm/include/asm/set_memory.h | 8 | |
| -rw-r--r-- | arch/arm/include/uapi/asm/Kbuild | 1 | |
| -rw-r--r-- | arch/arm/include/uapi/asm/unistd.h | 1 | |
| -rw-r--r-- | arch/arm/kernel/asm-offsets.c | 3 | |
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 8 | |
| -rw-r--r-- | arch/arm/kernel/hw_breakpoint.c | 2 | |
| -rw-r--r-- | arch/arm/kernel/machine_kexec.c | 8 | |
| -rw-r--r-- | arch/arm/kernel/process.c | 11 | |
| -rw-r--r-- | arch/arm/kernel/smccc-call.S | 11 | |
| -rw-r--r-- | arch/arm/kernel/suspend.c | 19 | |
| -rw-r--r-- | arch/arm/kernel/traps.c | 1 | |
| -rw-r--r-- | arch/arm/mach-footbridge/Kconfig | 21 | |
| -rw-r--r-- | arch/arm/mach-footbridge/Makefile | 2 | |
| -rw-r--r-- | arch/arm/mach-footbridge/personal-pci.c | 57 | |
| -rw-r--r-- | arch/arm/mach-footbridge/personal.c | 25 | |
| -rw-r--r-- | arch/arm/mach-iop32x/n2100.c | 8 | |
| -rw-r--r-- | arch/arm/mm/cache-v7.S | 58 | |
| -rw-r--r-- | arch/arm/mm/dump.c | 4 | |
| -rw-r--r-- | arch/arm/mm/init.c | 27 | |
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 39 | |
| -rw-r--r-- | arch/arm/mm/ptdump_debugfs.c | 15 | |
| -rw-r--r-- | arch/arm/probes/kprobes/test-arm.c | 294 | |
| -rw-r--r-- | arch/arm/probes/kprobes/test-core.h | 1 | |
| -rw-r--r-- | arch/arm/tools/Makefile | 26 | |
| -rw-r--r-- | arch/arm/tools/syscallhdr.sh | 31 | |
