On 1/8/24 11:24 AM, Jens Axboe wrote: > Also note that this will throw a merge conflict with the block branch, > as we killed the IORING_URING_CMD_POLLED flag and associated cookie in > struct io_uring_cmd, and this branch moved those things to a different > file. The resolution is to remove all of the offending hunk in > include/linux/io_uring.h and then edit include/linux/io_uring/cmd.h, > killing IORING_URING_CMD_POLLED in there and getting rid of the union > and cookie field in struct io_uring_cmd. Including my resolution of the > merge at the end of the email. Forgot to mention the security conflict too, which I was reminded of when that landed upstream. See: https://lore.kernel.org/lkml/20231204120314.5718b5f6@xxxxxxxxxxxxxxxx/ for the simple fix. -- Jens Axboe
