All conflicts seemed rather trivial, with some guidance from
Saeed Mameed on the tc_ct.c one.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | .gitignore | 3 | |
| -rw-r--r-- | .mailmap | 5 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg | 8 | |
| -rw-r--r-- | Documentation/admin-guide/README.rst | 2 | |
| -rw-r--r-- | Documentation/admin-guide/cgroup-v2.rst | 4 | |
| -rw-r--r-- | Documentation/admin-guide/device-mapper/index.rst | 1 | |
| -rw-r--r-- | Documentation/admin-guide/mm/transhuge.rst | 3 | |
| -rw-r--r-- | Documentation/arm64/cpu-feature-registers.rst | 2 | |
| -rw-r--r-- | Documentation/arm64/silicon-errata.rst | 8 | |
| -rw-r--r-- | Documentation/block/bfq-iosched.rst | 9 | |
| -rw-r--r-- | Documentation/core-api/dma-api.rst | 8 | |
| -rw-r--r-- | Documentation/core-api/pin_user_pages.rst | 2 | |
| -rw-r--r-- | Documentation/dev-tools/kcsan.rst | 6 | |
| -rw-r--r-- | Documentation/dev-tools/kunit/faq.rst | 40 | |
| -rw-r--r-- | Documentation/devicetree/bindings/Makefile | 38 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/bus/socionext,uniphier-system-bus.yaml | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/imx27-clock.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/imx31-clock.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/imx5-clock.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/bridge/sii902x.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/imx/ldb.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/rockchip/rockchip-drm.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/mediatek,mt7621-gpio.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/csky,mpintc.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mailbox/xlnx,zynqmp-ipi-mailbox.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/mediatek-bluetooth.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/audio-graph-card.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/thermal-sensor.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/ti,am654-thermal.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/csky,mptimer.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml | 4 | |
| -rw-r--r-- | Documentation/devicetree/writing-schema.rst | 9 | |
| -rw-r--r-- | Documentation/i2c/slave-eeprom-backend.rst | 22 | |
| -rw-r--r-- | Documentation/kbuild/modules.rst | 7 | |
| -rw-r--r-- | Documentation/kbuild/reproducible-builds.rst | 2 | |
| -rw-r--r-- | Documentation/mips/ingenic-tcu.rst | 2 | |
| -rw-r--r-- | Documentation/networking/arcnet.rst | 2 | |
| -rw-r--r-- | Documentation/networking/ax25.rst | 2 | |
| -rw-r--r-- | Documentation/networking/can_ucan_protocol.rst | 4 | |
| -rw-r--r-- | Documentation/networking/dsa/dsa.rst | 2 | |
| -rw-r--r-- | Documentation/networking/ip-sysctl.rst | 2 | |
| -rw-r--r-- | Documentation/networking/ipvs-sysctl.rst | 2 | |
| -rw-r--r-- | Documentation/networking/rxrpc.rst | 2 | |
| -rw-r--r-- | Documentation/process/changes.rst | 2 | |
| -rw-r--r-- | Documentation/process/coding-style.rst | 20 | |
| -rw-r--r-- | Documentation/virt/kvm/api.rst | 5 | |
| -rw-r--r-- | MAINTAINERS | 27 | |
| -rw-r--r-- | Makefile | 6 | |
| -rw-r--r-- | arch/arc/Kconfig | 15 | |
| -rw-r--r-- | arch/arc/Makefile | 21 | |
| -rw-r--r-- | arch/arc/include/asm/elf.h | 2 | |
| -rw-r--r-- | arch/arc/include/asm/irqflags-compact.h | 5 | |
| -rw-r--r-- | arch/arc/kernel/entry.S | 16 | |
| -rw-r--r-- | arch/arc/kernel/head.S | 8 | |
| -rw-r--r-- | arch/arc/kernel/setup.c | 19 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-baltos.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-boneblack-common.dtsi | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-boneblack-wireless.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-boneblue.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-evm.dts | 3 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-evmsk.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-lxm.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-pepper.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-pocketbeagle.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/am33xx-l4.dtsi | 6 | |
| -rw-r--r-- | arch/arm/boot/dts/am33xx.dtsi | 7 | |
| -rw-r--r-- | arch/arm/boot/dts/am4372.dtsi | 3 | |
| -rw-r--r-- | arch/arm/boot/dts/am437x-cm-t43.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/am437x-gp-evm.dts | 20 | |
| -rw-r--r-- | arch/arm/boot/dts/am437x-l4.dtsi | 5 | |
| -rw-r--r-- | arch/arm/boot/dts/am437x-sk-evm.dts | 18 | |
| -rw-r--r-- | arch/arm/boot/dts/am43x-epos-evm.dts | 16 | |
| -rw-r--r-- | arch/arm/boot/dts/am5729-beagleboneai.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm-nsp.dtsi | 10 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm958522er.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm958525er.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm958525xmc.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm958622hr.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm958623hr.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm958625hr.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm958625k.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/dra7-evm-common.dtsi | 20 | |
| -rw-r--r-- | arch/arm/boot/dts/dra7-l4.dtsi | 34 | |
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 13 | |
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 13 | |
| -rw-r--r-- | arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 146 | |
| -rw-r--r-- | arch/arm/include/asm/efi.h | 7 | |
| -rw-r--r-- | arch/arm/kernel/asm-offsets.c | 9 | |
| -rw-r--r-- | arch/arm/mach-bcm/Kconfig | 1 | |
| -rw-r--r-- | arch/arm/mach-imx/pm-imx5.c | 6 | |
| -rw-r--r-- | arch/arm/mach-imx/pm-imx6.c | 10 | |
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 2 | |
| -rw-r--r-- | arch/arm/mach-sti/board-dt.c | 9 | |
| -rw-r--r-- | arch/arm/xen/enlighten.c | 1 | |
| -rw-r--r-- | arch/arm64/Kconfig | 4 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi | 4 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 4 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 4 | |
| -rw-r--r-- | arch/arm64/include/asm/alternative.h | 16 | |
| -rw-r--r-- | arch/arm64/include/asm/arch_gicv3.h | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/arch_timer.h | 1 | |
| -rw-r--r-- | arch/arm64/include/asm/cpufeature.h | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/cputype.h | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/linkage.h | 6 | |
| -rw-r--r-- | arch/arm64/include/asm/mmu.h | 3 | |
| -rw-r--r-- | arch/arm64/include/asm/pgtable-prot.h | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/vdso/clocksource.h | 7 | |
| -rw-r--r-- | arch/arm64/include/asm/vdso/compat_gettimeofday.h | 8 | |
| -rw-r--r-- | arch/arm64/kernel/Makefile | 2 | |
| -rw-r--r-- | arch/arm64/kernel/alternative.c | 16 | |
| -rw-r--r-- | arch/arm64/kernel/cpu_errata.c | 24 | |
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 4 | |
| -rw-r--r-- | arch/arm64/kernel/entry-common.c | 2 | |
| -rw-r--r-- | arch/arm64/kernel/entry.S | 52 | |
| -rw-r--r-- | arch/arm64/kernel/kgdb.c | 2 | |
| -rw-r--r-- | arch/arm64/kernel/perf_regs.c | 25 | |
| -rw-r--r-- | arch/arm64/kernel/probes/kprobes.c | 12 | |
| -rw-r--r-- | arch/arm64/kernel/signal32.c | 27 | |
| -rw-r--r-- | arch/arm64/kernel/vdso.c | 61 | |
| -rw-r--r-- | arch/arm64/kernel/vdso/Makefile | 7 | |
| -rw-r--r-- | arch/arm64/kernel/vdso/sigreturn.S | 54 | |
| -rw-r--r-- | |
