FWIW, the fix was merged to stable branch and now the kernel package has been submitted to TW along with the update to 6.1.2.