linux-kernel - linux-next: manual merge of the drm-intel tree with the drm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20170519120326.6fa226fa@canb.auug.org.au>
Date:   Fri, 19 May 2017 12:04:15 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Daniel Vetter <daniel.vetter@...ll.ch>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Dave Airlie <airlied@...ux.ie>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Pandiyan Dhinakaran <dhinakaran.pandiyan@...el.com>,
        Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
        Jani Nikula <jani.nikula@...el.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree

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;