linux-next: manual merge of the drm tree with Linus' tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_prime.c between commit ebc0bad4a05a ("drm/prime:
Honor requested file flags when exporting a buffer") from Linus' tree and
commit ca793f75d91d ("drm: move pinning/unpinning to buffer attach") from
the drm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/drm_prime.c
index 5b7b911,d92853e..0000000
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@@ -185,12 -210,8 +210,7 @@@ static const struct dma_buf_ops drm_gem
  struct dma_buf *drm_gem_prime_export(struct drm_device *dev,
  				     struct drm_gem_object *obj, int flags)
  {
- 	if (dev->driver->gem_prime_pin) {
- 		int ret = dev->driver->gem_prime_pin(obj);
- 		if (ret)
- 			return ERR_PTR(ret);
- 	}
 -	return dma_buf_export(obj, &drm_gem_prime_dmabuf_ops, obj->size,
 -			     0600);
 +	return dma_buf_export(obj, &drm_gem_prime_dmabuf_ops, obj->size, flags);
  }
  EXPORT_SYMBOL(drm_gem_prime_export);

Attachment: pgp00000.pgp
Description: PGP signature