Re: [PATCH 4.9-stable v2 0/2] Port upstream patch v2 to 4.9.x