Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
From:   Jani Nikula <jani.nikula@linux.intel.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Dave Airlie <airlied@redhat.com>
Cc:     Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Matt Roper <matthew.d.roper@intel.com>
Subject: Re: linux-next: manual merge of the drm-intel tree with the drm tree
In-Reply-To: <20231003110957.34fc9483@canb.auug.org.au>
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
References: <20231003110957.34fc9483@canb.auug.org.au>
Date:   Thu, 05 Oct 2023 17:41:28 +0300
Message-ID: <87zg0xb087.fsf@intel.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

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