diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-14 13:44:08 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-14 13:44:08 +0100 |
commit | c4a07e264d38d5cad5d77298957cbd7d7db70b1f (patch) | |
tree | bf7d4da0dadc50248951c643ca4f3f16a6ef8d04 /include/uapi | |
parent | f87b564686ee47c480ccacc3922b38a8c54a6945 (diff) | |
parent | ceaa837f96adb69c0df0397937cd74991d5d821a (diff) | |
download | linux-stable-c4a07e264d38d5cad5d77298957cbd7d7db70b1f.tar.gz linux-stable-c4a07e264d38d5cad5d77298957cbd7d7db70b1f.tar.bz2 linux-stable-c4a07e264d38d5cad5d77298957cbd7d7db70b1f.zip |
Merge 6.2-rc8 into usb-next
We need the USB fixes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/drm/virtgpu_drm.h | 1 | ||||
-rw-r--r-- | include/uapi/linux/ip.h | 1 | ||||
-rw-r--r-- | include/uapi/linux/ipv6.h | 1 |
3 files changed, 3 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; diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h index 874a92349bf5..283dec7e3645 100644 --- a/include/uapi/linux/ip.h +++ b/include/uapi/linux/ip.h @@ -18,6 +18,7 @@ #ifndef _UAPI_LINUX_IP_H #define _UAPI_LINUX_IP_H #include <linux/types.h> +#include <linux/stddef.h> #include <asm/byteorder.h> #define IPTOS_TOS_MASK 0x1E diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h index 81f4243bebb1..53326dfc59ec 100644 --- a/include/uapi/linux/ipv6.h +++ b/include/uapi/linux/ipv6.h @@ -4,6 +4,7 @@ #include <linux/libc-compat.h> #include <linux/types.h> +#include <linux/stddef.h> #include <linux/in6.h> #include <asm/byteorder.h> |