From: Greg KH <gregkh@linuxfoundation.org>
To: Will Deacon <will.deacon@arm.com>
Cc: stable@vger.kernel.org, zhangbo_a@xiaomi.com
Subject: Re: FAILED: patch "[PATCH] iommu/io-pgtable-arm: Ensure we free the final level on" failed to apply to 4.4-stable tree
Date: Wed, 27 Jan 2016 09:57:36 -0800 [thread overview]
Message-ID: <20160127175736.GD22700@kroah.com> (raw)
In-Reply-To: <20160127115900.GG2390@arm.com>
On Wed, Jan 27, 2016 at 11:59:01AM +0000, Will Deacon wrote:
> Hi Greg,
>
> On Tue, Jan 26, 2016 at 10:48:23PM -0800, 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>.
>
> 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?
thanks,
greg k-h
next prev parent reply other threads:[~2016-01-27 17:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-27 6:48 FAILED: patch "[PATCH] iommu/io-pgtable-arm: Ensure we free the final level on" failed to apply to 4.4-stable tree gregkh
2016-01-27 11:59 ` Will Deacon
2016-01-27 17:57 ` Greg KH [this message]
2016-01-27 18:28 ` Will Deacon
2016-02-14 20:52 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160127175736.GD22700@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=stable@vger.kernel.org \
--cc=will.deacon@arm.com \
--cc=zhangbo_a@xiaomi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).