Hi all,
Today's linux-next merge of the drm-xe tree got a conflict in:
drivers/gpu/drm/xe/display/xe_display.c
between commit:
1b242ceec536 ("drm/i915/audio: convert to struct intel_display")
from the drm tree and commit:
d41d048043c4 ("drm/xe/display: Drop xe_display_driver_remove()")
Hi all,
Today's linux-next merge of the drm-xe tree got a conflict in:
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
between commit:
cb4046d289bd ("drm/i915: Drop dead code for xehpsdv")
from the drm tree and commit:
6a2a90cba12b ("drm/xe/display: Fix ADL-N detection")
from the drm
