Merge drm-upstream/drm-next into drm-misc-next
We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.
Signed-off-by:
Gustavo Padovan <gustavo.padovan@collabora.com>
No related branches found
No related tags found
Showing
- Documentation/admin-guide/pm/intel_pstate.rst 1 addition, 1 deletionDocumentation/admin-guide/pm/intel_pstate.rst
- Documentation/admin-guide/pm/sleep-states.rst 1 addition, 1 deletionDocumentation/admin-guide/pm/sleep-states.rst
- Documentation/bpf/bpf_devel_QA.txt 9 additions, 1 deletionDocumentation/bpf/bpf_devel_QA.txt
- Documentation/device-mapper/thin-provisioning.txt 4 additions, 1 deletionDocumentation/device-mapper/thin-provisioning.txt
- Documentation/devicetree/bindings/ata/ahci-platform.txt 0 additions, 1 deletionDocumentation/devicetree/bindings/ata/ahci-platform.txt
- Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt 1 addition, 0 deletions...on/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
- Documentation/devicetree/bindings/display/bridge/tda998x.txt 3 additions, 0 deletionsDocumentation/devicetree/bindings/display/bridge/tda998x.txt
- Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt 7 additions, 2 deletions...n/devicetree/bindings/display/exynos/exynos5433-decon.txt
- Documentation/devicetree/bindings/display/panel/panel-common.txt 1 addition, 1 deletion...tation/devicetree/bindings/display/panel/panel-common.txt
- Documentation/devicetree/bindings/display/renesas,du.txt 15 additions, 13 deletionsDocumentation/devicetree/bindings/display/renesas,du.txt
- Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt 1 addition, 0 deletionsDocumentation/devicetree/bindings/dma/renesas,rcar-dmac.txt
- Documentation/devicetree/bindings/gpu/samsung-scaler.txt 27 additions, 0 deletionsDocumentation/devicetree/bindings/gpu/samsung-scaler.txt
- Documentation/devicetree/bindings/input/atmel,maxtouch.txt 7 additions, 0 deletionsDocumentation/devicetree/bindings/input/atmel,maxtouch.txt
- Documentation/devicetree/bindings/net/can/rcar_canfd.txt 3 additions, 1 deletionDocumentation/devicetree/bindings/net/can/rcar_canfd.txt
- Documentation/devicetree/bindings/net/renesas,ravb.txt 1 addition, 0 deletionsDocumentation/devicetree/bindings/net/renesas,ravb.txt
- Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt 3 additions, 3 deletions...n/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
- Documentation/devicetree/bindings/serial/renesas,sci-serial.txt 2 additions, 0 deletions...ntation/devicetree/bindings/serial/renesas,sci-serial.txt
- Documentation/devicetree/bindings/vendor-prefixes.txt 1 addition, 0 deletionsDocumentation/devicetree/bindings/vendor-prefixes.txt
- Documentation/devicetree/overlay-notes.txt 8 additions, 0 deletionsDocumentation/devicetree/overlay-notes.txt
- Documentation/doc-guide/parse-headers.rst 2 additions, 2 deletionsDocumentation/doc-guide/parse-headers.rst
Loading
Please register or sign in to comment