For the sake of completeness, I have tested kernel 5.10.3 from Kernel:stable without your patch, and it fails to boot with the messages shown in comment 28.