From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:58815 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751279AbcBNUwS (ORCPT ); Sun, 14 Feb 2016 15:52:18 -0500 Date: Sun, 14 Feb 2016 12:52:18 -0800 From: Greg KH To: Will Deacon 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 Message-ID: <20160214205218.GA32596@kroah.com> References: <14538773031129@kroah.com> <20160127115900.GG2390@arm.com> <20160127175736.GD22700@kroah.com> <20160127182837.GC25545@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160127182837.GC25545@arm.com> Sender: stable-owner@vger.kernel.org List-ID: 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: > > On Wed, Jan 27, 2016 at 11:59:01AM +0000, Will Deacon wrote: > > > 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 . > > > > > > 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