OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bcbede6
45a3e24
)
Backmerge tag 'v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds...
author
Dave Airlie
<airlied@redhat.com>
Mon, 19 Jun 2023 05:59:52 +0000
(15:59 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 19 Jun 2023 06:01:25 +0000
(16:01 +1000)
Linux 6.4-rc7
Need this to pull in the msm work.
Signed-off-by: Dave Airlie <airlied@redhat.com>
16 files changed:
1
2
.mailmap
patch
|
diff1
|
diff2
|
blob
|
history
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/bridge/ti-sn65dsi86.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_fb_helper.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/msm/msm_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/msm/msm_gem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/scheduler/sched_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/arcfb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/au1200fb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/broadsheetfb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/core/fbmem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/ssd1307fb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/udlfb.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
.mailmap
Simple merge
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
Simple merge
diff --cc
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c
Simple merge
diff --cc
drivers/gpu/drm/bridge/ti-sn65dsi86.c
Simple merge
diff --cc
drivers/gpu/drm/drm_fb_helper.c
Simple merge
diff --cc
drivers/gpu/drm/msm/msm_drv.c
Simple merge
diff --cc
drivers/gpu/drm/msm/msm_gem.c
Simple merge
diff --cc
drivers/gpu/drm/scheduler/sched_main.c
Simple merge
diff --cc
drivers/video/fbdev/Kconfig
Simple merge
diff --cc
drivers/video/fbdev/arcfb.c
index
3d926c3
,
08d15e4
..
9aaea3b
---
1
/
drivers/video/fbdev/arcfb.c
---
2
/
drivers/video/fbdev/arcfb.c
+++ b/
drivers/video/fbdev/arcfb.c
@@@
-602,10
-598,9
+602,9
@@@
static void arcfb_remove(struct platfor
unregister_framebuffer(info);
if (irq)
free_irq(((struct arcfb_par *)(info->par))->irq, info);
- vfree(
(void __force *)info->screen_base
);
+ vfree(
info->screen_buffer
);
framebuffer_release(info);
}
- return 0;
}
static struct platform_driver arcfb_driver = {
diff --cc
drivers/video/fbdev/au1200fb.c
Simple merge
diff --cc
drivers/video/fbdev/broadsheetfb.c
Simple merge
diff --cc
drivers/video/fbdev/core/fbmem.c
Simple merge
diff --cc
drivers/video/fbdev/ssd1307fb.c
Simple merge
diff --cc
drivers/video/fbdev/udlfb.c
Simple merge