Merge tag 'v5.7-rc6' into objtool/core, to pick up fixes and resolve semantic conflict
Resolve structural conflict between:
59566b0b622e: ("x86/ftrace: Have ftrace trampolines turn read-only at the end of system boot up")
which introduced a new reference to 'ftrace_epilogue', and:
0298739b7983: ("x86,ftrace: Fix ftrace_regs_caller() unwind")
Which renamed it to 'ftrace_caller_end'. Rename the new usage site in the merge commit.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | Documentation/admin-guide/device-mapper/dm-integrity.rst | 15 | |
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 3 | |
| -rw-r--r-- | Documentation/arm64/amu.rst | 47 | |
| -rw-r--r-- | Documentation/core-api/printk-formats.rst | 14 | |
| -rw-r--r-- | Documentation/devicetree/bindings/Makefile | 21 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/lvds.yaml | 10 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/dma/fsl-edma.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/dma/socionext,uniphier-xdmac.yaml | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/st,stpmic1.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/mps,mp5416.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/rockchip-i2s.yaml | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/rockchip-spdif.txt | 45 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/rockchip-spdif.yaml | 101 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/renesas,usb3-peri.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/renesas,usbhs.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/usb-xhci.txt | 3 | |
| -rw-r--r-- | Documentation/filesystems/debugfs.rst | 4 | |
| -rw-r--r-- | Documentation/kbuild/makefiles.rst | 3 | |
| -rw-r--r-- | Documentation/networking/devlink/ice.rst | 4 | |
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 7 | |
| -rw-r--r-- | Documentation/usb/raw-gadget.rst | 37 | |
| -rw-r--r-- | Documentation/virt/kvm/index.rst | 2 | |
| -rw-r--r-- | Documentation/virt/kvm/running-nested-guests.rst | 276 | |
| -rw-r--r-- | MAINTAINERS | 85 | |
| -rw-r--r-- | Makefile | 17 | |
| -rw-r--r-- | arch/arc/include/asm/module.h | 5 | |
| -rw-r--r-- | arch/arc/include/asm/vermagic.h | 8 | |
| -rw-r--r-- | arch/arm/Kconfig | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/am574x-idk.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi.dtsi | 3 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-yapp4-ursa.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/motorola-mapphone-common.dtsi | 43 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-n950-n9.dtsi | 5 | |
| -rw-r--r-- | arch/arm/boot/dts/r7s9210.dtsi | 3 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a73a4.dtsi | 9 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7740.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7790-lager.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7790-stout.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-porter.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7792-blanche.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7792-wheat.dts | 12 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7793-gose.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7794-silk.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/rk3036.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/rk3228-evb.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/rk3229-xms6.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/rk322x.dtsi | 6 | |
| -rw-r--r-- | arch/arm/boot/dts/rk3xxx.dtsi | 2 | |
| -rw-r--r-- | arch/arm/configs/keystone_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 1 | |
| -rw-r--r-- | arch/arm/crypto/chacha-glue.c | 14 | |
| -rw-r--r-- | arch/arm/crypto/nhpoly1305-neon-glue.c | 2 | |
| -rw-r--r-- | arch/arm/crypto/poly1305-glue.c | 15 | |
| -rw-r--r-- | arch/arm/include/asm/futex.h | 9 | |
| -rw-r--r-- | arch/arm/include/asm/module.h | 24 | |
| -rw-r--r-- | arch/arm/include/asm/vermagic.h | 31 | |
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 2 | |
| -rw-r--r-- | arch/arm/mach-oxnas/platsmp.c | 3 | |
| -rw-r--r-- | arch/arm64/Kconfig | 1 | |
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 18 | |
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 1 | |
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 | |
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm.dtsi | 8 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mn.dtsi | 10 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h | 46 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp.dtsi | 6 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mq.dtsi | 8 | |
| -rw-r--r-- | arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 23 | |
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 3 | |
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/renesas/r8a77980.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 6 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/px30.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3308.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 5 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3328.dtsi | 18 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 9 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399.dtsi | 14 | |
| -rw-r--r-- | arch/arm64/configs/defconfig | 9 | |
| -rw-r--r-- | arch/arm64/crypto/chacha-neon-glue.c | 14 | |
| -rw-r--r-- | arch/arm64/crypto/nhpoly1305-neon-glue.c | 2 | |
| -rw-r--r-- | arch/arm64/crypto/poly1305-glue.c | 15 | |
| -rw-r--r-- | arch/arm64/include/asm/module.h | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/pointer_auth.h | 9 | |
| -rw-r--r-- | arch/arm64/include/asm/vermagic.h | 10 | |
| -rw-r--r-- | arch/arm64/kernel/machine_kexec.c | 1 | |
| -rw-r--r-- | arch/arm64/kernel/vdso/Makefile | 2 | |
| -rw-r--r-- | arch/arm64/kvm/guest.c | 7 | |
| -rw-r--r-- | arch/arm64/kvm/hyp/entry.S | 23 | |
| -rw-r--r-- | arch/arm64/kvm/hyp/hyp-entry.S | 1 | |
| -rw-r--r-- | arch/arm64/kvm/hyp/sysreg-sr.c | 17 | |
| -rw-r--r-- | arch/arm64/mm/hugetlbpage.c | 2 | |
| -rw-r--r-- | arch/csky/Kconfig | 2 | |
| -rw-r--r-- | arch/csky/Makefile | 2 | |
| -rw-r--r-- | arch/csky/abiv1/inc/abi/entry.h | 4 | |
| -rw-r--r-- | arch/csky/abiv2/inc/abi/entry.h | 4 | |
| -rw-r--r-- | arch/csky/abiv2/mcount.S | 2 | |
| -rw-r--r-- | arch/csky/include/asm/processor.h | 6 | |
| -rw-r--r-- | arch/csky/include/asm/ptrace.h | 10 | |
| -rw-r--r-- | arch/csky/include/asm/thread_info.h | 16 | |
| -rw-r--r-- | arch/csky/include/asm/uaccess.h | 49 | |
| -rw-r--r-- | arch/csky/kernel/Makefile | 2 | |
| -rw-r--r-- | arch/csky/kernel/asm-offsets.c | 3 | |
| -rw-r--r-- | arch/csky/kernel/dumpstack.c | 49 | |
| -rw-r--r-- | arch/csky/kernel/entry.S | 12 | |
| -rw-r--r-- | arch/csky/kernel/ftrace.c | 2 | |
| -rw-r--r-- | arch/csky/kernel/perf_callchain.c | 9 | |
| -rw-r--r-- | |
