In the just released 6.1.128 kernel [1] there is the above tested patch as 74a37ce697f3fa393324990c872a3a8933344f64 [2]
[1] https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.128 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.128&id=74a37ce697f3fa393324990c872a3a8933344f64