Yes, I expect to submit it into the next merge window (not the current v5.16 merge window, but v5.17). However, if your situation is urgent, and if it works for you, I could submit it as a fix for an earlier regression.
Although all that thread is beyond me to understand... [0] https://lore.kernel.org/all/20211111000414.GH641268@paulmck-ThinkPad-P17-Gen-1/