From: Xi Ruoyao <xry111@outlook.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Dave Airlie <airlied@linux.ie>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jani Nikula <jani.nikula@intel.com>,
Matt Roper <matthew.d.roper@intel.com>,
Damien Lespiau <damien.lespiau@intel.com>
Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Date: Mon, 16 Mar 2015 21:43:31 +0800 [thread overview]
Message-ID: <BLU437-SMTP229FA75B0BDC81D45AB16A9E020@phx.gbl> (raw)
In-Reply-To: <20150316133049.39f516f2@canb.auug.org.au>
On 03/16/2015 at 10:30 AM, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45
> ("drm/i915: Ensure plane->state->fb stays in sync with plane->fb") from
> the drm-intel-fixes tree and commit afd65eb4cc05 ("drm/i915: Ensure
> plane->state->fb stays in sync with plane->fb"), f55548b5af87
> ("drm/i915: Don't try to reference the fb in
> get_initial_plane_config()") and presumably others from the drm tree.
>
> Same patch summary, different authors, committers and added function.
>
> I fixed it up (I effectively used the drm tree version) and can carry
> the fix as necessary (no action is required).
>
My patch with commit 2dccc9898d45 is for Linux 4.0-rcN. It has no
relationship
with linux-next since Matt Roper's afd65eb4cc05 has solved this long
long ago.
So, 2dccc9898d45 should not be tagged with for-linux-next-fixes (in
repository
http://cgit.freedesktop.org/drm-intel/). I think it caused the mess of
version
control.
BTW, there is still one thing should be done in linux-next. We should
change
Matt's update_state_fb to use drm_atomic_set_fb_for_plane since the logic of
Matt's code is duplicated with drm_atomic_set_fb_for_plane.
--
Xi Ruoyao
School of Aerospace Science and Technology
Xidian University, Xi'an, China
next prev parent reply other threads:[~2015-03-16 13:44 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-16 2:30 linux-next: manual merge of the drm tree with the drm-intel-fixes tree Stephen Rothwell
2015-03-16 2:30 ` Stephen Rothwell
2015-03-16 13:43 ` Xi Ruoyao [this message]
2015-03-16 15:04 ` [Intel-gfx] " Jani Nikula
2015-03-16 15:04 ` Jani Nikula
-- strict thread matches above, loose matches on Subject: below --
2024-03-07 2:10 Stephen Rothwell
2024-03-07 8:27 ` Joonas Lahtinen
2023-04-17 14:39 broonie
2023-04-17 14:39 ` broonie
2022-05-17 1:26 Stephen Rothwell
2022-05-17 1:26 ` Stephen Rothwell
2022-02-25 16:14 broonie
2022-02-25 16:14 ` broonie
2022-02-22 17:03 broonie
2022-02-22 17:03 ` broonie
2020-05-08 3:50 Stephen Rothwell
2020-05-08 3:50 ` Stephen Rothwell
2020-05-07 2:43 Stephen Rothwell
2020-05-07 2:43 ` Stephen Rothwell
2020-01-22 0:37 Stephen Rothwell
2020-01-22 0:37 ` Stephen Rothwell
2020-01-08 1:15 Stephen Rothwell
2020-01-08 1:15 ` Stephen Rothwell
2020-01-08 1:10 Stephen Rothwell
2020-01-08 1:10 ` Stephen Rothwell
2020-01-08 1:04 Stephen Rothwell
2020-01-08 1:04 ` Stephen Rothwell
2020-01-08 2:28 ` Stephen Rothwell
2020-01-08 2:28 ` Stephen Rothwell
2019-10-31 0:33 Stephen Rothwell
2019-10-31 0:33 ` Stephen Rothwell
2019-11-08 0:42 ` Stephen Rothwell
2019-11-08 0:42 ` Stephen Rothwell
2019-11-08 0:42 ` Stephen Rothwell
2018-01-05 1:00 Stephen Rothwell
2018-01-05 1:00 ` Stephen Rothwell
2017-07-21 1:26 Stephen Rothwell
2017-07-21 1:26 ` Stephen Rothwell
2017-06-14 0:56 Stephen Rothwell
2017-06-14 0:56 ` Stephen Rothwell
2017-06-14 0:50 Stephen Rothwell
2017-06-09 2:26 Stephen Rothwell
2017-06-08 2:53 Stephen Rothwell
2017-06-08 2:53 ` Stephen Rothwell
2017-03-30 1:14 Stephen Rothwell
2017-03-30 1:08 Stephen Rothwell
2017-03-30 1:08 ` Stephen Rothwell
2017-03-22 0:00 Stephen Rothwell
2017-03-22 0:00 ` Stephen Rothwell
2017-03-27 17:14 ` Paul McKenney
2017-03-21 23:57 Stephen Rothwell
2017-03-21 23:57 ` Stephen Rothwell
2017-03-21 0:28 Stephen Rothwell
2017-03-21 0:28 ` Stephen Rothwell
2016-06-14 2:10 Stephen Rothwell
2016-06-14 2:10 ` Stephen Rothwell
2015-12-22 23:06 Stephen Rothwell
2015-12-22 23:06 ` Stephen Rothwell
2015-12-09 2:35 Stephen Rothwell
2015-12-09 2:35 ` Stephen Rothwell
2015-12-03 14:51 Mark Brown
2015-12-03 15:49 ` Jani Nikula
2015-12-03 15:49 ` Jani Nikula
2015-12-03 14:47 Mark Brown
2015-12-03 14:52 ` Imre Deak
2015-08-17 3:23 Stephen Rothwell
2015-08-17 3:23 ` Stephen Rothwell
2015-06-05 5:46 mpe@ellerman.id.au
2015-06-05 8:03 ` Jani Nikula
2015-06-05 8:03 ` Jani Nikula
2015-06-09 1:58 ` Stephen Rothwell
2015-06-09 1:58 ` Stephen Rothwell
2014-12-03 2:27 Stephen Rothwell
2014-12-03 2:27 ` Stephen Rothwell
2014-12-03 8:24 ` Jani Nikula
2014-12-03 8:24 ` Jani Nikula
2014-12-03 8:28 ` Stephen Rothwell
2014-11-17 3:04 Stephen Rothwell
2014-11-17 3:04 ` Stephen Rothwell
2014-07-23 2:38 Stephen Rothwell
2014-07-23 2:38 ` Stephen Rothwell
2014-07-09 4:06 Stephen Rothwell
2014-05-22 5:44 Stephen Rothwell
2014-05-22 5:40 Stephen Rothwell
2014-05-07 3:24 Stephen Rothwell
2013-10-28 5:46 Stephen Rothwell
2013-10-28 5:46 ` Stephen Rothwell
2013-10-28 6:12 ` Stephen Rothwell
2013-10-28 6:12 ` 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=BLU437-SMTP229FA75B0BDC81D45AB16A9E020@phx.gbl \
--to=xry111@outlook.com \
--cc=airlied@linux.ie \
--cc=damien.lespiau@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matthew.d.roper@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.