Hi all,

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

  drivers/gpu/drm/i915/gem/i915_gem_shmem.c

between commit:

  0c21ec1416a33 ("mm: update shmem_[kernel]_file_*() functions to use vma_flags_t")

from the mm-unstable tree and commit:

  a8a9a590221c1 ("drm/i915: Use huge tmpfs mountpoint helpers")

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/i915/gem/i915_gem_shmem.c
index fe1843497b27d,6ad1d6f99363e..0000000000000
--- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
@@@ -494,9 -496,11 +496,11 @@@ const struct drm_i915_gem_object_ops i9
  
  static int __create_shmem(struct drm_i915_private *i915,
  			  struct drm_gem_object *obj,
- 			  resource_size_t size)
+ 			  resource_size_t size,
+ 			  unsigned int flags)
  {
- 	const vma_flags_t flags = mk_vma_flags(VMA_NORESERVE_BIT);
 -	unsigned long shmem_flags = VM_NORESERVE;
++	const vma_flags_t shmem_flags = mk_vma_flags(VMA_NORESERVE_BIT);
+ 	struct vfsmount *huge_mnt;
  	struct file *filp;
  
  	drm_gem_private_object_init(&i915->drm, obj, size);