Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

uapi: Sync with the kernel in order to build systems without linux/time_types.h #709

Merged
merged 1 commit into from
Oct 24, 2022

Conversation

metze-samba
Copy link
Contributor

Fixes: #708

…me_types.h

Fixes: axboe#708
Signed-off-by: Stefan Metzmacher <metze@samba.org>
@axboe axboe merged commit 888096b into axboe:master Oct 24, 2022
@metze-samba
Copy link
Contributor Author

@axboe as vger.kernel.org seems to have problems today,
here's the kernel change I based this merge request on:
https://lore.kernel.org/io-uring/c7782923deeb4016f2ac2334bc558921e8d91a67.1666605446.git.metze@samba.org/T/#u
please also pick this into your kernel tree, otherwise the next import will overwrite this again...

Thanks!

@axboe
Copy link
Owner

axboe commented Oct 24, 2022

I never do blind imports, so there's no risk of that. I'll sync them up on the kernel side next time I need to do an update anyway.
Oh, and hadn't noticed vger having issues, I did get your email. I'll reply there.

BTW, this one has a typo in it, but it's inherited from the kernel side. So that should get fixed up there...

intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Nov 15, 2022
include/uapi/linux/io_uring.h is synced 1:1 into
liburing:src/include/liburing/io_uring.h.

liburing has a configure check to detect the need for
linux/time_types.h.

Fixes: 78a861b ("io_uring: add sync cancelation API through io_uring_register()")
Link: axboe/liburing#708
Link: axboe/liburing#709
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
ammarfaizi2 pushed a commit to ammarfaizi2/linux-fork that referenced this pull request Nov 15, 2022
include/uapi/linux/io_uring.h is synced 1:1 into
liburing:src/include/liburing/io_uring.h.

liburing has a configure check to detect the need for
linux/time_types.h.

Fixes: 78a861b ("io_uring: add sync cancelation API through io_uring_register()")
Link: axboe/liburing#708
Link: axboe/liburing#709
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Link: https://lore.kernel.org/r/20221115212614.1308132-2-ammar.faizi@intel.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
ammarfaizi2 pushed a commit to ammarfaizi2/linux-fork that referenced this pull request Dec 27, 2022
include/uapi/linux/io_uring.h is synced 1:1 into
liburing:src/include/liburing/io_uring.h.

liburing has a configure check to detect the need for
linux/time_types.h. It can opt-out by defining
UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H

Fixes: 78a861b ("io_uring: add sync cancelation API through io_uring_register()")
Link: axboe/liburing#708
Link: axboe/liburing#709
Link: https://lore.kernel.org/io-uring/20221115212614.1308132-1-ammar.faizi@intel.com/T/#m9f5dd571cd4f6a5dee84452dbbca3b92ba7a4091
CC: Jens Axboe <axboe@kernel.dk>
Cc: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Link: https://lore.kernel.org/r/7071a0a1d751221538b20b63f9160094fc7e06f4.1668630247.git.metze@samba.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

build broken on systems without linux/time_types.h
2 participants