backport upstream commit e1738bd9cecc5c867b0e2996470c1ff20f66ba79 to affected kernels...