The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x e56d4b633fffea9510db468085bed0799cba4ecd # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024061850-dislocate-twice-d872@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: e56d4b633fff ("nbd: Fix signal handling") 2a6751e052ab ("nbd: Improve the documentation of the locking assumptions") 3123ac779233 ("nbd: factor out a helper to get nbd_config without holding 'config_lock'") 1b59860540a4 ("nbd: fold nbd config initialization into nbd_alloc_config()") d32e2bf83791 ("block: pass a gendisk to ->open") 444aa2c58cb3 ("block: pass a gendisk on bdev_check_media_change") 48a905198024 ("ublk_drv: only allow owner to open unprivileged disk") 4093cb5a0634 ("ublk_drv: add mechanism for supporting unprivileged ublk device") bfbcef036396 ("ublk_drv: move ublk_get_device_from_id into ublk_ctrl_uring_cmd") 4b83e99ee709 ("Revert "pktcdvd: remove driver."") ce8a79d5601a ("Merge tag 'for-6.2/block-2022-12-08' of git://git.kernel.dk/linux") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
