Merge v5.16-rc5 into drm-next
Thomas Zimmermann requested a fixes backmerge, specifically also for 96c5f82e ("drm/vc4: fix error code in vc4_create_object()") Just a bunch of adjacent changes conflicts, even the big pile of them in vc4. Signed-off-by:Daniel Vetter <daniel.vetter@ffwll.ch>
Showing
- .mailmap 2 additions, 0 deletions.mailmap
- Documentation/admin-guide/blockdev/drbd/figures.rst 2 additions, 2 deletionsDocumentation/admin-guide/blockdev/drbd/figures.rst
- Documentation/admin-guide/blockdev/drbd/peer-states-8.dot 0 additions, 5 deletionsDocumentation/admin-guide/blockdev/drbd/peer-states-8.dot
- Documentation/arm64/pointer-authentication.rst 4 additions, 5 deletionsDocumentation/arm64/pointer-authentication.rst
- Documentation/conf.py 10 additions, 5 deletionsDocumentation/conf.py
- Documentation/cpu-freq/core.rst 3 additions, 3 deletionsDocumentation/cpu-freq/core.rst
- Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml 3 additions, 2 deletionsDocumentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
- Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml 1 addition, 1 deletion...ation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
- Documentation/devicetree/bindings/input/gpio-keys.yaml 1 addition, 1 deletionDocumentation/devicetree/bindings/input/gpio-keys.yaml
- Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml 2 additions, 12 deletions...ntation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
- Documentation/devicetree/bindings/net/ethernet-phy.yaml 8 additions, 0 deletionsDocumentation/devicetree/bindings/net/ethernet-phy.yaml
- Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml 1 addition, 1 deletionDocumentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml
- Documentation/devicetree/bindings/power/supply/bq25980.yaml 1 addition, 1 deletionDocumentation/devicetree/bindings/power/supply/bq25980.yaml
- Documentation/devicetree/bindings/sound/wlf,wm8962.yaml 3 additions, 0 deletionsDocumentation/devicetree/bindings/sound/wlf,wm8962.yaml
- Documentation/devicetree/bindings/spi/spi-rockchip.yaml 1 addition, 0 deletionsDocumentation/devicetree/bindings/spi/spi-rockchip.yaml
- Documentation/filesystems/cifs/ksmbd.rst 5 additions, 5 deletionsDocumentation/filesystems/cifs/ksmbd.rst
- Documentation/filesystems/netfs_library.rst 56 additions, 39 deletionsDocumentation/filesystems/netfs_library.rst
- Documentation/i2c/smbus-protocol.rst 8 additions, 6 deletionsDocumentation/i2c/smbus-protocol.rst
- Documentation/locking/locktypes.rst 3 additions, 6 deletionsDocumentation/locking/locktypes.rst
- Documentation/networking/ipvs-sysctl.rst 1 addition, 2 deletionsDocumentation/networking/ipvs-sysctl.rst
Loading