I do not know, sorry. But we prefer the upstream commits as much as
possible as one-off changes like this are almost always buggy and wrong
in the end.
Try doing the backports and see what that looks like please.
I did the backports now but Christoph Hellwig already pointed out:
No idea what is hidden in bugzilla, but the blk_mq_alloc_disk changes
aren't easily backportable.
[https://lore.kernel.org/all/20220308060916.GB23629@xxxxxx/]
Therefore I cherry-picked only the changes for blk_cleanup_disk as they
are much simpler than the changes to blk_mq_alloc_disk.
I kept the original commit messages, please tell me if you feel they
should be changed or do so yourself.
Please apply to 5.4 and 5.10.
Cheers,
Valentin
changelog:
v2:
* cherry pick from upstream commits instead of creating a new patch
