linux-kernel - linux-next: manual merge of the drm-xe tree with the drm-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 for Android: free password hash cracker in your pocket

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

Message-ID: <aXzW2mZ0Wn9PaNAG@sirena.org.uk>
Date: Fri, 30 Jan 2026 16:05:46 +0000
From: Mark Brown <broonie@...nel.org>
To: Thomas Hellström <thomas.hellstrom@...ux.intel.com>,
	DRM XE List <intel-xe@...ts.freedesktop.org>
Cc: Ashutosh Dixit <ashutosh.dixit@...el.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Shuicheng Lin <shuicheng.lin@...el.com>
Subject: linux-next: manual merge of the drm-xe tree with the drm-fixes tree

Hi all,

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

  drivers/gpu/drm/xe/xe_nvm.c

between commit:

  8a44241b0b83a ("drm/xe/nvm: Fix double-free on aux add failure")

from the drm-fixes tree and commits:

  11035eab1b7d8 ("drm/xe/nvm: Manage nvm aux cleanup with devres")
  a3187c0c2bbd9 ("drm/xe/nvm: Fix double-free on aux add failure")
  7755ed58a49f4 ("drm/xe/nvm: Defer xe->nvm assignment until init succeeds")

from the drm-xe 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 --combined drivers/gpu/drm/xe/xe_nvm.c
index 6f9dd519371c9,bc88804de5146..0000000000000
--- a/drivers/gpu/drm/xe/xe_nvm.c
+++ b/drivers/gpu/drm/xe/xe_nvm.c
@@@ -133,12 -133,10 +133,10 @@@ int xe_nvm_init(struct xe_device *xe
  	if (WARN_ON(xe->nvm))
  		return -EFAULT;
  
- 	xe->nvm = kzalloc(sizeof(*nvm), GFP_KERNEL);
- 	if (!xe->nvm)
+ 	nvm = kzalloc(sizeof(*nvm), GFP_KERNEL);
+ 	if (!nvm)
  		return -ENOMEM;
  
- 	nvm = xe->nvm;
- 
  	nvm->writable_override = xe_nvm_writable_override(xe);
  	nvm->non_posted_erase = xe_nvm_non_posted_erase(xe);
  	nvm->bar.parent = &pdev->resource[0];
@@@ -165,7 -163,6 +163,6 @@@
  	if (ret) {
  		drm_err(&xe->drm, "xe-nvm aux init failed %d\n", ret);
  		kfree(nvm);
- 		xe->nvm = NULL;
  		return ret;
  	}
  
@@@ -173,8 -170,9 +170,9 @@@
  	if (ret) {
  		drm_err(&xe->drm, "xe-nvm aux add failed %d\n", ret);
  		auxiliary_device_uninit(aux_dev);
- 		xe->nvm = NULL;
  		return ret;
  	}
+ 
+ 	xe->nvm = nvm;
  	return devm_add_action_or_reset(xe->drm.dev, xe_nvm_fini, xe);
  }

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