lkml.org 
[lkml]   [2023]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the drm-intel tree with the drm tree
Date
On Tue, 03 Oct 2023, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_drv.h
>
> between commits:
>
> c9517783060a ("drm/i915/dg2: Drop Wa_16011777198")
> 5a213086a025 ("drm/i915: Eliminate IS_MTL_GRAPHICS_STEP")
> 81af8abe6513 ("drm/i915: Eliminate IS_MTL_MEDIA_STEP")
>
> from the drm tree and commits:
>
> e50086f3d313 ("drm/i915/dg2: Drop pre-production display workarounds")
> 213454b3af2e ("drm/i915: Eliminate IS_MTL_DISPLAY_STEP")
>
> from the drm-intel tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Should be fixed now.

BR,
Jani.


--
Jani Nikula, Intel

\
 
 \ /
  Last update: 2023-10-05 17:20    [W:0.038 / U:0.564 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site