[ ] CONFLICT (modify/delete): Makefile deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of Makefile left in tree.
[ ] CONFLICT (modify/delete): configure deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of configure left in tree.
[ ] Auto-merging examples/Makefile
[ ] CONFLICT (content): Merge conflict in examples/Makefile
[ ] Auto-merging examples/send-zerocopy.c
[ ] CONFLICT (content): Merge conflict in examples/send-zerocopy.c
[ ] CONFLICT (modify/delete): man/io_uring_prep_socket.3 deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758
[ ] ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of man/io_uring_prep_socket.3 left in tree.
[ ] CONFLICT (modify/delete): man/io_uring_prep_timeout_update.3 deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of man/io_uring_prep_timeout_update.3 left in tree.
[ ] CONFLICT (modify/delete): man/io_uring_submit_and_wait.3 deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of man/io_uring_submit_and_wait.3 left in tree.
[ ] CONFLICT (modify/delete): man/io_uring_submit_and_wait_timeout.3 deleted in HEAD and modified in 0584faa90e6a6fa1dd
c66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of man/io_uring_submit_and_wait_timeout.3 left in tree.
[ ] CONFLICT (modify/delete): man/io_uring_wait_cqe_nr.3 deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of man/io_uring_wait_cqe_nr.3 left in tree.
[ ] CONFLICT (modify/delete): man/io_uring_wait_cqes.3 deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of man/io_uring_wait_cqes.3 left in tree.
[ ] CONFLICT (modify/delete): src/Makefile deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of src/Makefile left in tree.
[ ] CONFLICT (modify/delete): src/arch/aarch64/lib.h deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of src/arch/aarch64/lib.h left in tree.
[ ] CONFLICT (modify/delete): src/include/liburing.h deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of src/include/liburing.h left in tree.
[ ] CONFLICT (modify/delete): src/include/liburing/io_uring.h deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of src/include/liburing/io_uring.h left in tree.
[ ] CONFLICT (modify/delete): src/liburing-ffi.map deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of src/liburing-ffi.map left in tree.
[ ] CONFLICT (modify/delete): src/liburing.map deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of src/liburing.map left in tree.
[ ] CONFLICT (modify/delete): src/register.c deleted in HEAD and modified in 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b. Version 0584faa90e6a6fa1ddc66c751e1b738aa758ad6b of src/register.c left in tree.
[ ] Auto-merging test/Makefile
[ ] Auto-merging test/accept.c
[ ] CONFLICT (content): Merge conflict in test/accept.c
[ ] Auto-merging test/openat2.c
[ ] Auto-merging test/recv-multishot.c
[ ] CONFLICT (content): Merge conflict in test/recv-multishot.c
[ ] Auto-merging test/ring-leak.c
[ ] CONFLICT (content): Merge conflict in test/ring-leak.c
[ ] Auto-merging test/send-zerocopy.c
[ ] CONFLICT (content): Merge conflict in test/send-zerocopy.c
[ ] Auto-merging test/socket-io-cmd.c
[ ] CONFLICT (content): Merge conflict in test/socket-io-cmd.c
[ ] Automatic merge failed; fix conflicts and then commit the result.
the-moisrex
commented
8 months ago
It's been a while since I've merged from upstream.
From https://github.com/axboe/liburing branch master -> FETCH_HEAD