On Thu, 2018-08-16 at 13:56 +0200, gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Hello Greg,
This patch 3/3 is part of a series that the following three patches need to be applied in order of: - patch 1/3 commit f967db0b9ed44ec3057a28f3b28efc51df51b835 - patch 2/3 commit 785a19f9d1dd8a4ab2d0633be4656653bd3de1fc - patch 3/3 commit 5e0fb5df2ee871b841f96f9cb6a7f2784e96aa4e
I received emails for patch 1/3 (success) and patch 3/3 (this failure). So, I believe patch 2/3 was missed. So, please apply patch 2/3 first.
With patch 2/3 applied first, I confirmed that: - 4.18 - both 2/3 and 3/3 apply cleanly - 4.17 - both 2/3 and 3/3 apply cleanly - 4.9 - 2/3 has a hunk, but both apply properly - 4.4 - 2/3 has a merge error
I have attached merged patch 2/3 for 4.4. Patch 3/3 applies cleanly on top of it for 4.4.
Thanks, -Toshi