linux-kernel - linux-next: manual merge of the drm-msm 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:   Thu, 3 Aug 2017 13:03:01 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Clark <robdclark@...il.com>, Dave Airlie <airlied@...ux.ie>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Archit Taneja <architt@...eaurora.org>,
        Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>,
        Daniel Vetter <daniel.vetter@...ll.ch>
Subject: linux-next: manual merge of the drm-msm tree with the drm tree

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c

between commits:

  0b20a0f8c3cb ("drm: Add old state pointer to CRTC .enable() helper function")
  64581714b58b ("drm: Convert atomic drivers from CRTC .disable() to .atomic_disable()")

from the drm tree and commit:

  710e7a448783 ("drm/msm/mdp5: Don't use mode_set helper funcs for encoders and CRTCs")

from the drm-msm 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/msm/mdp/mdp5/mdp5_crtc.c
index 4322a502555a,aefe6d2cfa94..000000000000
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@@ -940,7 -954,8 +956,6 @@@ static const struct drm_crtc_funcs mdp5
  };
  
  static const struct drm_crtc_helper_funcs mdp5_crtc_helper_funcs = {
- 	.mode_set_nofb = mdp5_crtc_mode_set_nofb,
 -	.disable = mdp5_crtc_disable,
 -	.enable = mdp5_crtc_enable,
  	.atomic_check = mdp5_crtc_atomic_check,
  	.atomic_begin = mdp5_crtc_atomic_begin,
  	.atomic_flush = mdp5_crtc_atomic_flush,