linux-kernel - linux-next: manual merge of the drm-intel tree with the drm-misc 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]

Message-ID: <20250207111227.106a4468@canb.auug.org.au>
Date: Fri, 7 Feb 2025 11:12:27 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Simona Vetter <simona.vetter@...ll.ch>, Jani Nikula
 <jani.nikula@...ux.intel.com>, Joonas Lahtinen
 <joonas.lahtinen@...ux.intel.com>, Rodrigo Vivi <rodrigo.vivi@...el.com>
Cc: Intel Graphics <intel-gfx@...ts.freedesktop.org>, DRI
 <dri-devel@...ts.freedesktop.org>, Dmitry Baryshkov
 <dmitry.baryshkov@...aro.org>, Imre Deak <imre.deak@...el.com>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the drm-intel tree with the drm-misc
 tree

Hi all,

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

  drivers/gpu/drm/i915/display/intel_dp_mst.c

between commit:

  66df9debcb29 ("drm/connector: make mode_valid_ctx take a const struct drm_display_mode")

from the drm-misc tree and commit:

  d49b485d1be3 ("drm/i915/dp_mst: Use intel_connector vs. drm_connector pointer in intel_dp_mst.c")

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/display/intel_dp_mst.c
index aecaaf1d0fe2,2324ca8f6096..000000000000
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@@ -1422,8 -1454,8 +1454,8 @@@ static int mst_connector_get_modes(stru
  }
  
  static int
- mst_connector_mode_valid_ctx(struct drm_connector *connector,
+ mst_connector_mode_valid_ctx(struct drm_connector *_connector,
 -			     struct drm_display_mode *mode,
 +			     const struct drm_display_mode *mode,
  			     struct drm_modeset_acquire_ctx *ctx,
  			     enum drm_mode_status *status)
  {

Content of type "application/pgp-signature" skipped