linux-next: manual merge of the drm-xe tree with the drm-intel tree

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-intel tree and commit: d41d048043c4 ("drm/xe/display: Drop xe_display_driver_remov

linux-next: manual merge of the drm-xe tree with the drm-intel tree

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-intel tree and commit: 8b3f09fb44a3 ("drm/xe: Fix xe_display_fini() calls") from

linux-next: manual merge of the drm-xe tree with the drm-intel tree

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: 5c30cfa295cc ("drm/i915/dmc: Convert DMC code to intel_display") from the drm-intel tree and commit: a4de6beb83fc ("drm/xe/display: Separate the d3cold and non-

Re: linux-next: manual merge of the drm-xe tree with the drm-intel tree

On Wed, 11 Sep 2024, Stephen Rothwell wrote: > Hi all, > > On Fri, 6 Sep 2024 13:15:02 +1000 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the drm-xe tree got a conflict in: >> >> drivers/gpu/drm/xe/display/xe_display.c >> >> between commit: >> >> 11d0613af7c5 ("drm/i915/dis

Re: linux-next: manual merge of the drm-xe tree with the drm-intel tree

Hi all, On Fri, 6 Sep 2024 13:15:02 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-xe tree got a conflict in: > > drivers/gpu/drm/xe/display/xe_display.c > > between commit: > > 11d0613af7c5 ("drm/i915/display: include drm/drm_probe_helper.h where > needed") > > f

Re: linux-next: manual merge of the drm-xe tree with the drm-intel tree

On Fri, Sep 06, 2024 at 01:15:02PM GMT, Stephen Rothwell wrote: 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: 11d0613af7c5 ("drm/i915/display: include drm/drm_probe_helper.h where needed") from the drm-intel t

linux-next: manual merge of the drm-xe tree with the drm-intel tree

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: 11d0613af7c5 ("drm/i915/display: include drm/drm_probe_helper.h where needed") from the drm-intel tree and commit: 87d8ecf01544 ("drm/xe: replace #include with

Re: linux-next: manual merge of the drm-xe tree with the drm-intel tree

On Thu, Aug 15, 2024 at 11:37:17AM GMT, Stephen Rothwell wrote: 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: 769b081c18b9 ("drm/i915/opregion: convert to struct intel_display") from the drm-intel tree and com

linux-next: manual merge of the drm-xe tree with the drm-intel tree

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: 769b081c18b9 ("drm/i915/opregion: convert to struct intel_display") from the drm-intel tree and commit: 1eda95cba9df ("drm/xe: Rename enable_display module para

linux-next: manual merge of the drm-xe tree with the drm-intel tree

Hi all, Today's linux-next merge of the drm-xe tree got a conflict in: drivers/gpu/drm/xe/xe_device.h between commit: c01c6066e6fa ("drm/xe/device: implement transient flush") from the drm-intel tree and commits: fb74b205cdd2 ("drm/xe: Introduce a simple wedged state") 8ed9aaae39f3 ("

linux-next: manual merge of the drm-xe tree with the drm-intel tree

Hi all, Today's linux-next merge of the drm-xe tree got a conflict in: drivers/gpu/drm/xe/xe_device_types.h between commits: ded402c7a044 ("drm/i915: move skl_preferred_vco_freq to display substruct") 8219ab6d6f0d ("drm/i915: move max_dotclk_freq to display substruct") 9aad73290686 ("dr