From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus <torvalds@linux-foundation•org>
Cc: Will Deacon <will.deacon@arm•com>,
Jeremy Fitzhardinge <jeremy@goop•org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>,
Stefano Stabellini <stefano.stabellini@eu•citrix.com>,
Xen Devel <Xen-devel@lists•xensource.com>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
"linux-arm-kernel@lists•infradead.org"
<linux-arm-kernel@lists•infradead.org>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
David Vrabel <david.vrabel@citrix•com>,
Catalin Marinas <Catalin.Marinas@arm•com>,
Russell King <linux@arm•linux.org.uk>
Subject: linux-next: missing merge fix patch for the merge of the xen-tip tree with the arm-soc tree
Date: Tue, 23 Dec 2014 13:26:05 +1100 [thread overview]
Message-ID: <20141223132605.02d81e01@canb.auug.org.au> (raw)
In-Reply-To: <20141208103328.GE27367@arm.com>
[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]
Hi Linus,
I have been carrying this merge fix patch for some time that is now
needed in your tree:
From: Stephen Rothwell <sfr@canb•auug.org.au>
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 <will.deacon@arm•com>
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
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);
}
--
2.1.3
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-12-23 2:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-08 7:49 linux-next: manual merge of the xen-tip tree with the arm-soc tree Stephen Rothwell
2014-12-08 10:33 ` Will Deacon
2014-12-23 2:26 ` Stephen Rothwell [this message]
2014-12-23 4:09 ` linux-next: missing merge fix patch for the " Linus Torvalds
2014-12-23 6:32 ` Stephen Rothwell
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=20141223132605.02d81e01@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Catalin.Marinas@arm$(echo .)com \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=arnd@arndb$(echo .)de \
--cc=david.vrabel@citrix$(echo .)com \
--cc=jeremy@goop$(echo .)org \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=olof@lixom$(echo .)net \
--cc=stefano.stabellini@eu$(echo .)citrix.com \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=will.deacon@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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