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

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/xe/xe_mmio_gem.c

between commit:

  d0c0952878193 ("drm/xe/mmio_gem: fix destroy flow")

from the drm-fixes tree and commits:

  fb2ee38bab802 ("drm/xe/mmio_gem: fix destroy flow")
  7cf85c190814c ("drm/xe/mmio_gem: reject VM_EXEC and drop VM_DONTCOPY")

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_mmio_gem.c
index 5ffe03d361902,3cdc9538957d2..0000000000000
--- a/drivers/gpu/drm/xe/xe_mmio_gem.c
+++ b/drivers/gpu/drm/xe/xe_mmio_gem.c
@@@ -177,9 -177,12 +177,12 @@@ static int xe_mmio_gem_mmap(struct drm_
  	if ((vma->vm_flags & VM_SHARED) == 0)
  		return -EINVAL;
  
+ 	if (vma->vm_flags & VM_EXEC)
+ 		return -EINVAL;
+ 
  	vma->vm_page_prot = pgprot_noncached(vma_get_page_prot(vma));
- 	vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP |
- 		     VM_DONTCOPY | VM_NORESERVE);
+ 	vm_flags_mod(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP |
+ 		     VM_NORESERVE, VM_MAYEXEC);
  
  	/* Defer actual mapping to the fault handler. */
  	return 0;

Attachment: signature.asc
Description: PGP signature