Merge remote-tracking branch 'dma-buf/for-next'

Conflicts:
	drivers/gpu/drm/i915/i915_gem_dmabuf.c
	drivers/staging/android/sync.c

diff --cc drivers/base/Kconfig
Simple merge

diff --cc drivers/base/dma-buf.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_dmabuf.c
index 580aa42443edc87823dc4fb8f3776ea0d39b6b52,817ec444c97649ef1a02aa9618a21b84d18b7a87..5b5842c61c339d5fa46dc69c70e54b04055e16a5
--- 1/drivers/gpu/drm/i915/i915_gem_dmabuf.c
--- 2/drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
@@@ -229,15 -233,8 +229,16 @@@ static const struct dma_buf_ops i915_dm
  struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
                                      struct drm_gem_object *gem_obj, int flags)
  {
-       return dma_buf_export(gem_obj, &i915_dmabuf_ops, gem_obj->size, flags);
 +      struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);
 +
 +      if (obj->ops->dmabuf_export) {
 +              int ret = obj->ops->dmabuf_export(obj);
 +              if (ret)
 +                      return ERR_PTR(ret);
 +      }
 +
+       return dma_buf_export(gem_obj, &i915_dmabuf_ops, gem_obj->size, flags,
+                               NULL);
  }
  
  static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj)

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
Simple merge

diff --cc drivers/gpu/drm/tegra/gem.c
Simple merge

diff --cc drivers/staging/android/ion/ion.c
Simple merge

diff --cc drivers/staging/android/sw_sync.c
Simple merge

diff --cc drivers/staging/android/sync.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge