From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org,
Russell King <linux@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Will Deacon <will.deacon@arm•com>,
Laurent Pinchart <laurent.pinchart+renesas@ideasonboard•com>
Subject: linux-next: manual merge of the arm-soc tree with the arm-current tree
Date: Fri, 30 Jan 2015 09:58:45 +1100 [thread overview]
Message-ID: <20150130095845.260bd804@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 976 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mm/dma-mapping.c between commit c2273a185354 ("ARM: 8288/1:
dma-mapping: don't detach devices without an IOMMU during teardown")
from the arm-current tree and commit eab8d6530cc0 ("arm: dma-mapping:
Set DMA IOMMU ops in arm_iommu_attach_device()") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mm/dma-mapping.c
index f142ddd6c40a,a673c7f7e208..000000000000
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@ -2025,10 -2048,7 +2048,10 @@@ static void arm_teardown_iommu_dma_ops(
{
struct dma_iommu_mapping *mapping = dev->archdata.mapping;
+ if (!mapping)
+ return;
+
- arm_iommu_detach_device(dev);
+ __arm_iommu_detach_device(dev);
arm_iommu_release_mapping(mapping);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-01-29 22:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-29 22:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-04-11 6:21 linux-next: manual merge of the arm-soc tree with the arm-current tree Stephen Rothwell
2012-09-04 6:06 Stephen Rothwell
2012-09-04 8:08 ` Arnd Bergmann
2012-09-04 9:01 ` Russell King - ARM Linux
2012-09-04 12:44 ` Rob Herring
2012-09-04 13:03 ` Stephen Rothwell
2012-09-04 13:11 ` Arnd Bergmann
2012-09-04 13:19 ` 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=20150130095845.260bd804@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=laurent.pinchart+renesas@ideasonboard$(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=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