git/linux-nf
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git synced 2026-04-18 06:34:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Backmerge tag 'v4.11-rc6' into drm-next

Browse Source 
Linux 4.11-rc6

drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
This commit is contained in:
Dave Airlie
2017-04-11 07:40:42 +10:00
parent 1420f63b82 39da7c509a
commit b769fefb68
476 changed files with 6953 additions and 2851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
View File

@@ -546,7 +546,7 @@ static int vmw_user_dmabuf_synccpu_grab(struct vmw_user_dma_buffer *user_bo,
return ret;
ret = ttm_ref_object_add(tfile, &user_bo->prime.base,
TTM_REF_SYNCCPU_WRITE, &existed);
TTM_REF_SYNCCPU_WRITE, &existed, false);
if (ret != 0 || existed)
ttm_bo_synccpu_write_release(&user_bo->dma.base);
@@ -730,7 +730,7 @@ int vmw_user_dmabuf_reference(struct ttm_object_file *tfile,
*handle = user_bo->prime.base.hash.key;
return ttm_ref_object_add(tfile, &user_bo->prime.base,
TTM_REF_USAGE, NULL);
TTM_REF_USAGE, NULL, false);
}
/**