[PATCH 0/2] stable-5.12 backport fixes