linux-next: manual merge of the drm-xe tree with the origin tree

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/xe/xe_nvm.c

between commits:

  69050f8d6d075 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")
  bf4afc53b77ae ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")

from the origin tree and commits:

  8a44241b0b83a ("drm/xe/nvm: Fix double-free on aux add failure")
  7755ed58a49f4 ("drm/xe/nvm: Defer xe->nvm assignment until init succeeds")
  a3187c0c2bbd9 ("drm/xe/nvm: Fix double-free on aux add failure")

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 --cc drivers/gpu/drm/xe/xe_nvm.c
index 9c4ccd3b39d4d,1fdfb690ea3d3..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_obj(*nvm);
- 	if (!xe->nvm)
 -	nvm = kzalloc(sizeof(*nvm), GFP_KERNEL);
++	nvm = kzalloc_obj(*nvm);
+ 	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];

Attachment: signature.asc
Description: PGP signature