[PATCH 0/1] v6.1 stable backport request