From patchwork Tue Dec 23 02:26:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 5529581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3FE16BEEA8 for ; Tue, 23 Dec 2014 02:28:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A4002018E for ; Tue, 23 Dec 2014 02:28:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 538732012D for ; Tue, 23 Dec 2014 02:28:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y3FBO-0004VI-TT; Tue, 23 Dec 2014 02:26:46 +0000 Received: from ozlabs.org ([103.22.144.67]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y3FBK-0004NR-Ak for linux-arm-kernel@lists.infradead.org; Tue, 23 Dec 2014 02:26:42 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 2D71D14009B; Tue, 23 Dec 2014 13:26:12 +1100 (AEDT) Date: Tue, 23 Dec 2014 13:26:05 +1100 From: Stephen Rothwell To: Linus Subject: linux-next: missing merge fix patch for the merge of the xen-tip tree with the arm-soc tree Message-ID: <20141223132605.02d81e01@canb.auug.org.au> In-Reply-To: <20141208103328.GE27367@arm.com> References: <20141208184908.27bfd605@canb.auug.org.au> <20141208103328.GE27367@arm.com> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141222_182642_645541_FB3426B9 X-CRM114-Status: GOOD ( 16.07 ) X-Spam-Score: -2.3 (--) Cc: Jeremy Fitzhardinge , Xen Devel , Russell King , Arnd Bergmann , Stefano Stabellini , Catalin Marinas , Konrad Rzeszutek Wilk , Will Deacon , "linux-kernel@vger.kernel.org" , "linux-next@vger.kernel.org" , David Vrabel , Olof Johansson , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, I have been carrying this merge fix patch for some time that is now needed in your tree: From: Stephen Rothwell Date: Mon, 8 Dec 2014 18:46:59 +1100 Subject: [PATCH] arm: introduce is_device_dma_coherent merge fix The merge of the (linux-next) xen-tip tree got a conflict in arch/arm/include/asm/dma-mapping.h between commits a3a60f81ee6f ("dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_ops") and 4bb25789ed28 ("arm: dma-mapping: plumb our iommu mapping ops into arch_setup_dma_ops") from the arm-soc tree and commit 3d5391ac6f5e ("arm: introduce is_device_dma_coherent") from the xen-tip tree. It was fixed up, but also required this additional fix. "Looks good to me"-by: Will Deacon Signed-off-by: Stephen Rothwell --- arch/arm/mm/dma-mapping.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 09645f00bd17..43064cbe58f9 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -2058,6 +2058,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, else dma_ops = arm_get_dma_map_ops(coherent); + dev->archdata.dma_coherent = coherent; set_dma_ops(dev, dma_ops); }