Yes, we've been applying a patch for this downstream in Gentoo for a little while
now:
* https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=d3ba9963dbecff37c7b0d46913519cc22bc877c0
* https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=181caad4a8ad9f6a2ead5b4d596e6e83f123bb05
I think we did send it (or a previous variant) upstream at some point
but I can't find the link right now.