projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
983095e
1613e60
)
Merge drm/drm-next into drm-misc-next
author
Maxime Ripard
<mripard@kernel.org>
Mon, 27 May 2024 09:08:31 +0000
(11:08 +0200)
committer
Maxime 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
patch
|
diff1
|
diff2
|
blob
|
history
Documentation/devicetree/bindings/display/panel/panel-simple.yaml
patch
|
diff1
|
diff2
|
blob
|
history
Documentation/devicetree/bindings/vendor-prefixes.yaml
patch
|
diff1
|
diff2
|
blob
|
history
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/omapdrm/omap_gem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/panel/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/panel/panel-ilitek-ili9341.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/renesas/rcar-du/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/virtio/virtgpu_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/fb.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/devicetree/bindings/display/panel/boe,tv101wum-nl6.yaml
Simple merge
diff --cc
Documentation/devicetree/bindings/display/panel/panel-simple.yaml
Simple merge
diff --cc
Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge
diff --cc
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
Simple merge
diff --cc
drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
Simple merge
diff --cc
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
Simple merge
diff --cc
drivers/gpu/drm/omapdrm/omap_gem.c
Simple merge
diff --cc
drivers/gpu/drm/panel/Kconfig
Simple merge
diff --cc
drivers/gpu/drm/panel/panel-ilitek-ili9341.c
index
761fce1
,
b933380
..
775d5d5
---
1
/
drivers/gpu/drm/panel/panel-ilitek-ili9341.c
---
2
/
drivers/gpu/drm/panel/panel-ilitek-ili9341.c
+++ b/
drivers/gpu/drm/panel/panel-ilitek-ili9341.c
@@@
-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)
diff --cc
drivers/gpu/drm/renesas/rcar-du/Kconfig
Simple merge
diff --cc
drivers/gpu/drm/virtio/virtgpu_drv.c
Simple merge
diff --cc
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge
diff --cc
include/linux/fb.h
Simple merge