]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <mripard@kernel.org>
Mon, 27 May 2024 09:08:31 +0000 (11:08 +0200)
committerMaxime Ripard <mripard@kernel.org>
Mon, 27 May 2024 09:08:31 +0000 (11:08 +0200)
Let's start the new release cycle.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
15 files changed:
1  2 
Documentation/devicetree/bindings/display/panel/boe,tv101wum-nl6.yaml
Documentation/devicetree/bindings/display/panel/panel-simple.yaml
Documentation/devicetree/bindings/vendor-prefixes.yaml
MAINTAINERS
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
drivers/gpu/drm/omapdrm/omap_gem.c
drivers/gpu/drm/panel/Kconfig
drivers/gpu/drm/panel/panel-ilitek-ili9341.c
drivers/gpu/drm/renesas/rcar-du/Kconfig
drivers/gpu/drm/virtio/virtgpu_drv.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
include/linux/fb.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
index 761fce1f24b31272009472ce45daf0242be180fc,b933380b7eb783fad1d1101b61d7a630ade11315..775d5d5e828ca5a5f1b006d7591327ef258530cd
@@@ -722,11 -723,10 +723,11 @@@ static int ili9341_probe(struct spi_dev
  
        if (!strcmp(id->name, "sf-tc240t-9370-t"))
                return ili9341_dpi_probe(spi, dc, reset);
 -      else if (!strcmp(id->name, "yx240qv29"))
 +
 +      if (!strcmp(id->name, "yx240qv29"))
                return ili9341_dbi_probe(spi, dc, reset);
  
-       return -1;
+       return -ENODEV;
  }
  
  static void ili9341_remove(struct spi_device *spi)
Simple merge
Simple merge
Simple merge