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

diff --combined drivers/base/dma-buf.c
index 460e22dee36dbb2389524f7287eb103b936e2c58,877eacb9b7d334618c3ceb0c3e184716ba8f272d..a3f79c495a411ea85b87604ab473fcef6b962558
--- 1/drivers/base/dma-buf.c
--- 2/drivers/base/dma-buf.c
+++ b/drivers/base/dma-buf.c
@@@ -298,6 -298,8 +298,8 @@@ void dma_buf_unmap_attachment(struct dm
                                struct sg_table *sg_table,
                                enum dma_data_direction direction)
  {
+       might_sleep();
+ 
        if (WARN_ON(!attach || !attach->dmabuf || !sg_table))
                return;
  
@@@ -460,7 -462,8 +462,7 @@@ int dma_buf_mmap(struct dma_buf *dmabuf
        if (vma->vm_file)
                fput(vma->vm_file);
  
 -      vma->vm_file = dmabuf->file;
 -      get_file(vma->vm_file);
 +      vma->vm_file = get_file(dmabuf->file);
  
        vma->vm_pgoff = pgoff;