On Wed, Jan 27, 2016 at 06:28:37PM +0000, Will Deacon wrote:

On Wed, Jan 27, 2016 at 09:57:36AM -0800, Greg KH wrote:

quoted

On Wed, Jan 27, 2016 at 11:59:01AM +0000, Will Deacon wrote:

quoted

On Tue, Jan 26, 2016 at 10:48:23PM -0800, gregkh@linuxfoundation.org wrote:

quoted

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 [off-list ref].

Do you have the conflict handy? It applies to 4.4 here, so I guess its
somehow conflicting with another -stable patch, but I couldn't spot it.

The whole thing fails to apply:

Applying iommu-io-pgtable-arm-ensure-we-free-the-final-level-on-teardown.patch to linux-4.4.y
Applying patch iommu-io-pgtable-arm-ensure-we-free-the-final-level-on-teardown.patch
patching file drivers/iommu/io-pgtable-arm.c
Hunk #1 FAILED at 404.
1 out of 1 hunk FAILED -- rejects in file drivers/iommu/io-pgtable-arm.c

It also doesn't apply to a clean 4.4 tree for me either:

~/linux/stable $ git clone -s linux-4.4.y/ x
Cloning into 'x'...
done.
Checking out files: 100% (52221/52221), done.
~/linux/stable $ cd x
~/linux/stable/x $ git show --pretty=email 12c2ab09571e8aae3a87da2a4a452632a5fac1e5 > x.patch
~/linux/stable/x $ patch -p1 --dry-run < x.patch
checking file drivers/iommu/io-pgtable-arm.c
Hunk #1 FAILED at 404.
1 out of 1 hunk FAILED

How are you applying this?

$ git cherry-pick 12c2ab09571e8aae3a87da2a4a452632a5fac1e5

It looks like there's a small change in context that patch doesn't like.
Updated patch below.

Thanks, that worked.

greg k-h