diff options
author | 2023-02-17 11:06:39 +0000 | |
---|---|---|
committer | 2023-02-17 11:06:39 +0000 | |
commit | 675f176b4dcc2b75adbcea7ba0e9a649527f53bd (patch) | |
tree | dc5eea870c19b405bb6558964e5367bb6c9205c5 /include/uapi | |
parent | Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/m... (diff) | |
parent | Merge tag 'drm-fixes-2023-02-17' of git://anongit.freedesktop.org/drm/drm (diff) | |
download | linux-675f176b4dcc2b75adbcea7ba0e9a649527f53bd.tar.gz linux-675f176b4dcc2b75adbcea7ba0e9a649527f53bd.tar.bz2 linux-675f176b4dcc2b75adbcea7ba0e9a649527f53bd.zip |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Some of the devlink bits were tricky, but I think I got it right.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/drm/virtgpu_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h index 0512fde5e697..7b158fcb02b4 100644 --- a/include/uapi/drm/virtgpu_drm.h +++ b/include/uapi/drm/virtgpu_drm.h @@ -64,6 +64,7 @@ struct drm_virtgpu_map { __u32 pad; }; +/* fence_fd is modified on success if VIRTGPU_EXECBUF_FENCE_FD_OUT flag is set. */ struct drm_virtgpu_execbuffer { __u32 flags; __u32 size; |