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
Date: Thu, 05 Oct 2023 17:41:28 +0300 [thread overview]
Message-ID: <87zg0xb087.fsf@intel.com> (raw)
In-Reply-To: <20231003110957.34fc9483@canb.auug.org.au>
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
next prev parent reply other threads:[~2023-10-05 15:18 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-03 0:09 linux-next: manual merge of the drm-intel tree with the drm tree Stephen Rothwell
2023-10-05 14:41 ` Jani Nikula [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-30 1:59 Stephen Rothwell
2023-05-30 1:57 Stephen Rothwell
2023-05-30 2:10 ` Stephen Rothwell
2023-01-24 23:42 Stephen Rothwell
2022-09-13 2:19 Stephen Rothwell
2022-09-12 1:46 Stephen Rothwell
2022-02-11 2:06 Stephen Rothwell
2022-02-09 0:55 Stephen Rothwell
2021-08-12 1:28 Stephen Rothwell
2021-04-01 2:13 Stephen Rothwell
2021-03-17 3:08 Stephen Rothwell
2021-03-18 1:52 ` Stephen Rothwell
2021-04-29 22:23 ` Stephen Rothwell
2021-05-14 1:53 ` Stephen Rothwell
2021-05-14 12:14 ` Thomas Zimmermann
2021-01-25 0:46 Stephen Rothwell
2020-07-14 2:59 Stephen Rothwell
2019-08-22 3:15 Stephen Rothwell
2019-02-06 0:42 Stephen Rothwell
2019-01-17 1:59 Stephen Rothwell
2017-05-19 2:04 Stephen Rothwell
2016-09-07 3:59 Stephen Rothwell
2014-07-23 3:18 Stephen Rothwell
2014-07-23 3:06 Stephen Rothwell
2014-07-23 5:09 ` Daniel Vetter
2014-04-03 1:00 Stephen Rothwell
2014-01-22 3:09 Stephen Rothwell
2014-01-22 3:04 Stephen Rothwell
2014-01-22 10:06 ` Daniel Vetter
2014-01-23 1:21 ` Olof Johansson
2014-01-23 21:10 ` Olof Johansson
2013-11-07 2:37 Stephen Rothwell
2013-08-29 4:09 Stephen Rothwell
2013-06-18 3:04 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zg0xb087.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=airlied@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matthew.d.roper@intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).