From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll•ch>,
Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Dave Airlie <airlied@linux•ie>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Pandiyan Dhinakaran <dhinakaran.pandiyan@intel•com>,
Maarten Lankhorst <maarten.lankhorst@linux•intel.com>,
Jani Nikula <jani.nikula@intel•com>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Fri, 19 May 2017 12:04:15 +1000 [thread overview]
Message-ID: <20170519120326.6fa226fa@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/intel_dp_mst.c
between commit:
f424f55e3177 ("drm/i915: Track MST link bandwidth")
from the drm tree and commit:
3d65a735d834 ("drm/i915/mst: use max link not sink lane count")
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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/intel_dp_mst.c
index 1dee9933005f,5af22a7c11bf..000000000000
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@@ -56,7 -56,8 +56,7 @@@ static bool intel_dp_mst_compute_config
* for MST we always configure max link bw - the spec doesn't
* seem to suggest we should do otherwise.
*/
- lane_count = drm_dp_max_lane_count(intel_dp->dpcd);
+ lane_count = intel_dp_max_lane_count(intel_dp);
-
pipe_config->lane_count = lane_count;
pipe_config->pipe_bpp = bpp;
next reply other threads:[~2017-05-19 2:04 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-19 2:04 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-02 23:18 linux-next: manual merge of the drm-intel tree with the drm tree Stephen Rothwell
2023-10-03 0:09 Stephen Rothwell
2023-10-05 14:41 ` Jani Nikula
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
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
2013-05-01 4:37 Stephen Rothwell
2013-05-01 8:08 ` Daniel Vetter
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=20170519120326.6fa226fa@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dhinakaran.pandiyan@intel$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maarten.lankhorst@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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