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: <20251103101349.5af777a5@canb.auug.org.au>
Date: Mon, 3 Nov 2025 10:13:49 +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: Jani Nikula <jani.nikula@...el.com>, Intel Graphics
 <intel-gfx@...ts.freedesktop.org>, DRI <dri-devel@...ts.freedesktop.org>,
 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/gt/intel_rc6.c

between commit:

  f6e8dc9edf96 ("drm: include drm_print.h where needed")

from the drm-misc tree and commits:

  8c2833ff1df3 ("drm/i915: add vlv_clock_get_czclk()")
  5615e78e813e ("drm/i915: split out vlv_clock.[ch]")

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/gt/intel_rc6.c
index 13721c9081b6,932f9f1b06b2..000000000000
--- a/drivers/gpu/drm/i915/gt/intel_rc6.c
+++ b/drivers/gpu/drm/i915/gt/intel_rc6.c
@@@ -6,8 -6,7 +6,9 @@@
  #include <linux/pm_runtime.h>
  #include <linux/string_helpers.h>
  
 +#include <drm/drm_print.h>
 +
+ #include "display/vlv_clock.h"
  #include "gem/i915_gem_region.h"
  #include "i915_drv.h"
  #include "i915_reg.h"

Content of type "application/pgp-signature" skipped