Following patches need the RDMA rc branch since we are past the RC cycle
now.
Merge conflicts resolved based on Linux-next:
- For RXE odp changes keep for-next version and fixup new places that
need to call is_odp_mr()
https://lore.kernel.org/r/20250422143019.500201bd@canb.auug.org.au
https://lore.kernel.org/r/20250514122455.3593b083@canb.auug.org.au
- irdma is keeping the while/kfree bugfix from -rc and the pf/cdev_info
change from for-next
https://lore.kernel.org/r/20250513130630.280ee6c5@canb.auug.org.au
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
| -rw-r--r-- | .clang-format | 41 | |
| -rw-r--r-- | .clippy.toml | 2 | |
| -rw-r--r-- | .mailmap | 11 | |
| -rw-r--r-- | CREDITS | 4 | |
| -rw-r--r-- | Documentation/ABI/stable/sysfs-block | 2 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-system-cpu | 1 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd | 4 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon | 4 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-ufs | 32 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-kernel-reboot | 10 | |
| -rw-r--r-- | Documentation/admin-guide/hw-vuln/index.rst | 2 | |
| -rw-r--r-- | Documentation/admin-guide/hw-vuln/indirect-target-selection.rst | 168 | |
| -rw-r--r-- | Documentation/admin-guide/hw-vuln/rsb.rst | 268 | |
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 23 | |
| -rw-r--r-- | Documentation/admin-guide/xfs.rst | 37 | |
| -rw-r--r-- | Documentation/arch/openrisc/openrisc_port.rst | 12 | |
| -rw-r--r-- | Documentation/arch/riscv/hwprobe.rst | 2 | |
| -rw-r--r-- | Documentation/arch/x86/cpuinfo.rst | 69 | |
| -rw-r--r-- | Documentation/bpf/bpf_devel_QA.rst | 8 | |
| -rw-r--r-- | Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml | 18 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/can/microchip,mcp2510.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/ethernet-controller.yaml | 97 | |
| -rw-r--r-- | Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/nvmem/rockchip,otp.yaml | 25 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/soc/fsl/fsl,ls1028a-reset.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 19 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/nxp,sysctr-timer.yaml | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/renesas,tpu.yaml | 56 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/microchip,usb5744.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/xlnx,usb2.yaml | 1 | |
| -rw-r--r-- | Documentation/filesystems/ext4/super.rst | 20 | |
| -rw-r--r-- | Documentation/kbuild/reproducible-builds.rst | 17 | |
| -rw-r--r-- | Documentation/netlink/specs/ethtool.yaml | 4 | |
| -rw-r--r-- | Documentation/netlink/specs/ovs_vport.yaml | 4 | |
| -rw-r--r-- | Documentation/netlink/specs/rt_link.yaml | 20 | |
| -rw-r--r-- | Documentation/netlink/specs/rt_neigh.yaml | 14 | |
| -rw-r--r-- | Documentation/netlink/specs/tc.yaml | 10 | |
| -rw-r--r-- | Documentation/networking/netdevices.rst | 10 | |
| -rw-r--r-- | Documentation/networking/timestamping.rst | 8 | |
| -rw-r--r-- | Documentation/power/runtime_pm.rst | 2 | |
| -rw-r--r-- | Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst | 12 | |
| -rw-r--r-- | Documentation/translations/zh_TW/arch/openrisc/openrisc_port.rst | 12 | |
| -rw-r--r-- | Documentation/userspace-api/mseal.rst | 2 | |
| -rw-r--r-- | Documentation/virt/kvm/api.rst | 723 | |
| -rw-r--r-- | Documentation/wmi/devices/msi-wmi-platform.rst | 4 | |
| -rw-r--r-- | MAINTAINERS | 281 | |
| -rw-r--r-- | Makefile | 13 | |
| -rw-r--r-- | arch/arm/boot/dts/amlogic/meson8.dtsi | 6 | |
| -rw-r--r-- | arch/arm/boot/dts/amlogic/meson8b.dtsi | 6 | |
| -rw-r--r-- | arch/arm/boot/dts/nxp/imx/imx6ul-imx6ull-opos6ul.dtsi | 3 | |
| -rw-r--r-- | arch/arm/configs/at91_dt_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/collie_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/dove_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/exynos_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 2 | |
| -rw-r--r-- | arch/arm/configs/lpc18xx_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/lpc32xx_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/milbeaut_m10v_defconfig | 2 | |
| -rw-r--r-- | arch/arm/configs/mmp2_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/multi_v4t_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/multi_v5_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/mvebu_v5_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/mxs_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 3 | |
| -rw-r--r-- | arch/arm/configs/orion5x_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/pxa168_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/pxa910_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/pxa_defconfig | 2 | |
| -rw-r--r-- | arch/arm/configs/s5pv210_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/sama7_defconfig | 2 | |
| -rw-r--r-- | arch/arm/configs/spitz_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/stm32_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/wpcm450_defconfig | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 38 | |
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 14 | |
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 22 | |
| -rw-r--r-- | arch/arm64/boot/dts/amazon/alpine-v2.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/amazon/alpine-v3.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 | |
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi | 4 | |
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 6 | |
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 6 | |
| -rw-r--r-- | arch/arm64/boot/dts/apple/t8103-j293.dts | 10 | |
| -rw-r--r-- | arch/arm64/boot/dts/apple/t8112-j493.dts | 10 | |
| -rw-r--r-- | arch/arm64/boot/dts/arm/morello.dtsi | 22 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 25 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp-nominal.dtsi | 28 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi | 12 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp.dtsi | 6 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx95.dtsi | 8 | |
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi | 8 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi | 3 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/px30-engicam-ctouch2.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-edimm2.2.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-cb2.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588.dtsi | 4 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3588j.dtsi | 53 | |
| -rw-r--r-- | arch/arm64/boot/dts/st/stm32mp211.dtsi | 8 | |
| -rw-r--r-- | arch/arm64/boot/dts/st/stm32mp231.dtsi | 9 | |
| -rw-r--r-- | arch/arm64/boot/dts/st/stm32mp251.dtsi | 9 | |
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/cputype.h | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/el2_setup.h | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/esr.h | 44 | |
| -rw-r--r-- | arch/arm64/include/asm/insn.h | 1 | |
| -rw-r--r-- | arch/arm64/include/asm/kvm_arm.h | 3 | |
| -rw-r--r-- | arch/arm64/include/asm/kvm_emulate.h | 7 | |
| -rw-r--r-- | arch/arm64/include/asm/kvm_host.h | 5 | |
| -rw-r--r-- | arch/arm64/include/asm/kvm_ras.h | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/mmu.h | 11 | |
| -rw-r--r-- | arch/arm64/include/asm/rqspinlock.h | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/spectre.h | 3 | |
| -rw-r--r-- | arch/arm64/include/asm/vdso/gettimeofday.h | 13 | |
| -rw-r--r-- | arch/arm64/kernel/cpu_errata.c | 2 | |
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 9 | |
| -rw-r--r-- | arch/arm64/kernel/image-vars.h | 4 | |
| -rw-r--r-- | arch/arm64/kernel/pi/map_kernel.c | 25 | |
| -rw-r--r-- | arch/arm64/kernel/proton-pack.c |
