git.maquefel.me Git - linux.git/commit

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)
commit	f112b68f273fb0121cb64e0c3ac06adcb91e32b8
tree	8e5ca44719c39e6d37d9a85c6c1b5759952e3da7	tree \| snapshot
parent	aa775edbbe7b44cc732bfa7c56ac3957d84113d5	commit \| diff
parent	d206a76d7d2726f3b096037f2079ce0bd3ba329b	commit \| diff

Merge v6.8-rc6 into drm-next

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:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_hw_37xx.c	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_hw_40xx.c	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_job.c	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_syncobj.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_tv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/meson/meson_encoder_cvbs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/meson/meson_encoder_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/meson/meson_encoder_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_svm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/scheduler/sched_main.c	diff1 \|	diff2 \|	blob \| history
include/uapi/drm/nouveau_drm.h	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_hw_37xx.c	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_hw_40xx.c	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_job.c	diff1 \|	diff2 \|	blob \| history
drivers/accel/ivpu/ivpu_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_syncobj.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_tv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/meson/meson_encoder_cvbs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/meson/meson_encoder_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/meson/meson_encoder_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_svm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/scheduler/sched_main.c	diff1 \|	diff2 \|	blob \| history
include/uapi/drm/nouveau_drm.h	diff1 \|	diff2 \|	blob \| history