diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-09 07:47:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-09 07:47:32 +0100 |
| commit | c2fb9a214da1efc3f8968daa795a1bbbf50cbfc8 (patch) | |
| tree | 9bcfc2ea89e09ec2614e4d84518ffcb4327eb223 /include/uapi/linux/io_uring.h | |
| parent | 5220cb493bf418cc4ce5f3ba961dbd0207441731 (diff) | |
| parent | b7bfaa761d760e72a969d116517eaa12e404c262 (diff) | |
| download | lwn-c2fb9a214da1efc3f8968daa795a1bbbf50cbfc8.tar.gz lwn-c2fb9a214da1efc3f8968daa795a1bbbf50cbfc8.zip | |
Merge 6.2-rc3 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux/io_uring.h')
| -rw-r--r-- | include/uapi/linux/io_uring.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 9d4c4078e8d0..2780bce62faf 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -10,7 +10,15 @@ #include <linux/fs.h> #include <linux/types.h> +/* + * this file is shared with liburing and that has to autodetect + * if linux/time_types.h is available or not, it can + * define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H + * if linux/time_types.h is not available + */ +#ifndef UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H #include <linux/time_types.h> +#endif #ifdef __cplusplus extern "C" { |