linux-kernel - linux-next: manual merge of the drm tree with the drm-intel-fixes 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: <ZnCBa7N6-wLbkERq@sirena.org.uk>
Date: Mon, 17 Jun 2024 19:33:15 +0100
From: Mark Brown <broonie@...nel.org>
To: Dave Airlie <airlied@...hat.com>, DRI <dri-devel@...ts.freedesktop.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Riana Tauro <riana.tauro@...el.com>,
	Rodrigo Vivi <rodrigo.vivi@...el.com>,
	Thomas Hellström <thomas.hellstrom@...ux.intel.com>
Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes
 tree

Hi all,

Today's linux-next merge of the drm tree got conflicts in:

  drivers/gpu/drm/xe/xe_gt_idle.c
  drivers/gpu/drm/xe/xe_guc_pc.c

between commits:

  2470b141bfae2 ("drm/xe: move disable_c6 call")
  7c877115da419 ("drm/xe/xe_gt_idle: use GT forcewake domain assertion")

from the drm-intel-fixes tree and commits:

  21b7085546481 ("drm/xe/xe_gt_idle: use GT forcewake domain assertion")
  6800e63cf97ba ("drm/xe: move disable_c6 call")

from the drm 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.

diff --cc drivers/gpu/drm/xe/xe_gt_idle.c
index 944770fb2daff,5d6181117ab26..0000000000000
--- a/drivers/gpu/drm/xe/xe_gt_idle.c
+++ b/drivers/gpu/drm/xe/xe_gt_idle.c
diff --cc drivers/gpu/drm/xe/xe_guc_pc.c
index 23382ced4ea74,508f0d39b4ad5..0000000000000
--- a/drivers/gpu/drm/xe/xe_guc_pc.c
+++ b/drivers/gpu/drm/xe/xe_guc_pc.c

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)