projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aa775ed
d206a76
)
Merge v6.8-rc6 into drm-next
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Mon, 26 Feb 2024 10:41:07 +0000
(11:41 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Mon, 26 Feb 2024 10:41:07 +0000
(11:41 +0100)
Thomas Zimmermann asked to backmerge -rc6 for drm-misc branches,
there's a few same-area-changed conflicts (xe and amdgpu mostly) that
are getting a bit too annoying.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
20 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/accel/ivpu/ivpu_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/accel/ivpu/ivpu_fw.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/accel/ivpu/ivpu_hw_37xx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/accel/ivpu/ivpu_hw_40xx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/accel/ivpu/ivpu_job.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/accel/ivpu/ivpu_pm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_crtc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_syncobj.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/display/intel_dp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/display/intel_sdvo.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/display/intel_tv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/meson/meson_encoder_cvbs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/meson/meson_encoder_dsi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/meson/meson_encoder_hdmi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/nouveau/nouveau_svm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/scheduler/sched_main.c
patch
|
diff1
|
diff2
|
blob
|
history
include/uapi/drm/nouveau_drm.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/accel/ivpu/ivpu_drv.c
Simple merge
diff --cc
drivers/accel/ivpu/ivpu_fw.c
Simple merge
diff --cc
drivers/accel/ivpu/ivpu_hw_37xx.c
Simple merge
diff --cc
drivers/accel/ivpu/ivpu_hw_40xx.c
Simple merge
diff --cc
drivers/accel/ivpu/ivpu_job.c
Simple merge
diff --cc
drivers/accel/ivpu/ivpu_pm.c
Simple merge
diff --cc
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge
diff --cc
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
Simple merge
diff --cc
drivers/gpu/drm/drm_crtc.c
Simple merge
diff --cc
drivers/gpu/drm/drm_syncobj.c
Simple merge
diff --cc
drivers/gpu/drm/i915/display/intel_dp.c
Simple merge
diff --cc
drivers/gpu/drm/i915/display/intel_sdvo.c
Simple merge
diff --cc
drivers/gpu/drm/i915/display/intel_tv.c
Simple merge
diff --cc
drivers/gpu/drm/meson/meson_encoder_cvbs.c
Simple merge
diff --cc
drivers/gpu/drm/meson/meson_encoder_dsi.c
Simple merge
diff --cc
drivers/gpu/drm/meson/meson_encoder_hdmi.c
Simple merge
diff --cc
drivers/gpu/drm/nouveau/nouveau_svm.c
Simple merge
diff --cc
drivers/gpu/drm/scheduler/sched_main.c
Simple merge
diff --cc
include/uapi/drm/nouveau_drm.h
Simple merge