linux-next: manual merge of the drm-msm tree with the drm tree

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/msm/msm_drv.h

between commit:

  3c9edd9c85f5 ("drm/msm: Introduce GEM object funcs")

from the drm tree and commit:

  8f642378bfe5 ("drm/msm/gem: Move prototypes to msm_gem.h")

from the drm-msm tree.

I fixed it up (I used the former version of this flie and added the
following fix patch) 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.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 5 Nov 2020 12:10:23 +1100
Subject: [PATCH] drm/msm/gem: fix up for "drm/msm: Introduce GEM object funcs"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/gpu/drm/msm/msm_gem.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
index d79e7019cc88..9c422af6dd49 100644
--- a/drivers/gpu/drm/msm/msm_gem.h
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -94,7 +94,6 @@ struct msm_gem_object {
 int msm_gem_mmap_obj(struct drm_gem_object *obj,
 			struct vm_area_struct *vma);
 int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
-vm_fault_t msm_gem_fault(struct vm_fault *vmf);
 uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);
 int msm_gem_get_iova(struct drm_gem_object *obj,
 		struct msm_gem_address_space *aspace, uint64_t *iova);
-- 
2.28.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgpMGXcdTNck5.pgp
Description: OpenPGP digital signature