On Sun, May 7, 2023 at 5:00 AM Jens Axboe <axboe@xxxxxxxxx> wrote: > > Note that this will throw a merge conflict in the ublk_drv code, due > to this branch still being based off the original for-6.4/io_uring > branch. Resolution is pretty straight forward, I'm including it below > for reference. Mine is somewhat different - I think the "ub_cmd" argument to __ublk_ch_uring_cmd() should also have been made a 'const' pointer. And then using an actual initializer allows us to do the same thing for the copy in ublk_ch_uring_cmd() (and also makes it clear that it initializes the whole struct - which it did, but still...) So my conflict resolution looks a bit more complicated, but I think it's the RightThing(tm) to do, and is consistent with the constification in commit fd9b8547bc5c ("io_uring: Pass whole sqe to commands"). Linus