From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1173#note_5994258...
Yes, this is the commit referenced in bz 1965610 and 1963356 as well. I am just going to keep this tagged as include until upstream can agree on the proper solution. I don't think it needs to merge unless upstream can't come up with a fix before 5.13.0