Trvial merge conflicts against rdma.git for-rc resolved matching
linux-next:
drivers/infiniband/hw/hns/hns_roce_hw_v2.c
drivers/infiniband/hw/hns/hns_roce_main.c
https://lore.kernel.org/r/20220929124005.105149-1-broonie@kernel.org
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
| -rw-r--r-- | .get_maintainer.ignore | 2 | |
| -rw-r--r-- | .mailmap | 10 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-system-cpu | 1 | |
| -rw-r--r-- | Documentation/admin-guide/README.rst | 30 | |
| -rw-r--r-- | Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst | 14 | |
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 2 | |
| -rw-r--r-- | Documentation/admin-guide/mm/damon/usage.rst | 18 | |
| -rw-r--r-- | Documentation/admin-guide/sysctl/net.rst | 2 | |
| -rw-r--r-- | Documentation/arm64/elf_hwcaps.rst | 10 | |
| -rw-r--r-- | Documentation/arm64/silicon-errata.rst | 2 | |
| -rw-r--r-- | Documentation/atomic_bitops.txt | 10 | |
| -rw-r--r-- | Documentation/block/index.rst | 1 | |
| -rw-r--r-- | Documentation/block/ublk.rst | 253 | |
| -rw-r--r-- | Documentation/conf.py | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/renesas,riic.yaml | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/goodix.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/khadas,mcu.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/qcom-emac.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/power/qcom,rpmpd.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml | 79 | |
| -rw-r--r-- | Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/spi/cdns,qspi-nor-peripheral-props.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/rcar-thermal.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/qcom,dwc3.yaml | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 2 | |
| -rw-r--r-- | Documentation/i2c/busses/i2c-piix4.rst | 13 | |
| -rw-r--r-- | Documentation/i2c/dev-interface.rst | 2 | |
| -rw-r--r-- | Documentation/i2c/i2c-topology.rst | 214 | |
| -rw-r--r-- | Documentation/i2c/slave-interface.rst | 6 | |
| -rw-r--r-- | Documentation/i2c/writing-clients.rst | 4 | |
| -rw-r--r-- | Documentation/input/joydev/joystick.rst | 1 | |
| -rw-r--r-- | Documentation/kbuild/kconfig-language.rst | 4 | |
| -rw-r--r-- | Documentation/networking/devlink/netdevsim.rst | 2 | |
| -rw-r--r-- | Documentation/networking/driver.rst | 2 | |
| -rw-r--r-- | Documentation/networking/ip-sysctl.rst | 5 | |
| -rw-r--r-- | Documentation/networking/ipvlan.rst | 2 | |
| -rw-r--r-- | Documentation/networking/l2tp.rst | 2 | |
| -rw-r--r-- | Documentation/networking/mptcp-sysctl.rst | 1 | |
| -rw-r--r-- | Documentation/networking/nf_conntrack-sysctl.rst | 9 | |
| -rw-r--r-- | Documentation/networking/rxrpc.rst | 11 | |
| -rw-r--r-- | Documentation/networking/switchdev.rst | 2 | |
| -rw-r--r-- | Documentation/sphinx/kerneldoc-preamble.sty | 22 | |
| -rw-r--r-- | Documentation/tools/rtla/rtla-timerlat-hist.rst | 2 | |
| -rw-r--r-- | Documentation/translations/ja_JP/SubmittingPatches | 3 | |
| -rw-r--r-- | MAINTAINERS | 86 | |
| -rw-r--r-- | Makefile | 11 | |
| -rw-r--r-- | arch/Kconfig | 6 | |
| -rw-r--r-- | arch/alpha/include/asm/bitops.h | 7 | |
| -rw-r--r-- | arch/arm/boot/dts/am33xx-l4.dtsi | 3 | |
| -rw-r--r-- | arch/arm/boot/dts/am5748.dtsi | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/arm-realview-eb.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/arm-realview-pb1176.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 21 | |
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d2_icp.dts | 21 | |
| -rw-r--r-- | arch/arm/boot/dts/at91-sama7g5ek.dts | 18 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm63178.dtsi | 20 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm6846.dtsi | 18 | |
| -rw-r--r-- | arch/arm/boot/dts/bcm6878.dtsi | 9 | |
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 12 | |
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/integratorap-im-pd1.dts | 5 | |
| -rw-r--r-- | arch/arm/boot/dts/integratorap.dts | 9 | |
| -rw-r--r-- | arch/arm/boot/dts/lan966x.dtsi | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/moxart-uc7112lx.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/moxart.dtsi | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/versatile-ab.dts | 2 | |
| -rw-r--r-- | arch/arm/configs/at91_dt_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/sama7_defconfig | 1 | |
| -rw-r--r-- | arch/arm/kernel/irq.c | 2 | |
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 36 | |
| -rw-r--r-- | arch/arm/mach-at91/pm_suspend.S | 24 | |
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixp4xx-of.c | 2 | |
| -rw-r--r-- | arch/arm/mach-sunplus/Kconfig | 4 | |
| -rw-r--r-- | arch/arm64/Kconfig | 19 | |
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-base.dtsi | 3 | |
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts | 1 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 10 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 1 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 1 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts | 4 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 21 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mn.dtsi | 1 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 14 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 10 | |
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts | 20 | |
