diff for duplicates of <54B50555.6090803@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index f088938..12e91dd 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -35,10 +35,10 @@ On 13/01/15 11:08, Stefano Stabellini wrote:
 >
 > In file included from include/linux/dma-mapping.h:82:0,
 >                   from arch/arm64/kernel/asm-offsets.c:23:
-> ./arch/arm64/include/asm/dma-mapping.h: In function ‘phys_to_dma’:
-> ./arch/arm64/include/asm/dma-mapping.h:69:2: error: ‘struct dev_archdata’ has no member named ‘mapping’
-> ./arch/arm64/include/asm/dma-mapping.h: In function ‘dma_to_phys’:
-> ./arch/arm64/include/asm/dma-mapping.h:81:19: error: ‘struct dev_archdata’ has no member named ‘mapping’
+> ./arch/arm64/include/asm/dma-mapping.h: In function ?phys_to_dma?:
+> ./arch/arm64/include/asm/dma-mapping.h:69:2: error: ?struct dev_archdata? has no member named ?mapping?
+> ./arch/arm64/include/asm/dma-mapping.h: In function ?dma_to_phys?:
+> ./arch/arm64/include/asm/dma-mapping.h:81:19: error: ?struct dev_archdata? has no member named ?mapping?
 > make[1]: *** [arch/arm64/kernel/asm-offsets.s] Error 1
 >
 
@@ -54,8 +54,3 @@ of the logical dependency (I don't think my Kconfig-fu is strong enough
 to guarantee that dependency is enforced).
 
 Robin.
-
-_______________________________________________
-iommu mailing list
-iommu@lists.linux-foundation.org
-https://lists.linuxfoundation.org/mailman/listinfo/iommu
diff --git a/a/content_digest b/N1/content_digest
index d126972..b01ba16 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,18 +1,9 @@
  "ref\0cover.1421086706.git.robin.murphy@arm.com\0"
  "ref\0alpine.DEB.2.02.1501131102540.3058@kaball.uk.xensource.com\0"
- "ref\0alpine.DEB.2.02.1501131102540.3058-7Z66fg9igcxYtxbxJUhB2Dgeux46jI+i@public.gmane.org\0"
- "From\0Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\0"
- "Subject\0Re: [RFC PATCH 0/5] arm64: IOMMU-backed DMA mapping\0"
+ "From\0robin.murphy@arm.com (Robin Murphy)\0"
+ "Subject\0[RFC PATCH 0/5] arm64: IOMMU-backed DMA mapping\0"
  "Date\0Tue, 13 Jan 2015 11:45:25 +0000\0"
- "To\0Stefano Stabellini <stefano.stabellini-mvvWK6WmYclDPfheJLI6IQ@public.gmane.org>\0"
- "Cc\0linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>"
-  arnd-r2nGTMty4D4@public.gmane.org <arnd-r2nGTMty4D4@public.gmane.org>
-  Catalin Marinas <Catalin.Marinas-5wv7dgnIgG8@public.gmane.org>
-  Will Deacon <Will.Deacon-5wv7dgnIgG8@public.gmane.org>
-  iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org <iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>
-  thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org <thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
-  dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On 13/01/15 11:08, Stefano Stabellini wrote:\n"
@@ -52,10 +43,10 @@
  ">\n"
  "> In file included from include/linux/dma-mapping.h:82:0,\n"
  ">                   from arch/arm64/kernel/asm-offsets.c:23:\n"
- "> ./arch/arm64/include/asm/dma-mapping.h: In function \342\200\230phys_to_dma\342\200\231:\n"
- "> ./arch/arm64/include/asm/dma-mapping.h:69:2: error: \342\200\230struct dev_archdata\342\200\231 has no member named \342\200\230mapping\342\200\231\n"
- "> ./arch/arm64/include/asm/dma-mapping.h: In function \342\200\230dma_to_phys\342\200\231:\n"
- "> ./arch/arm64/include/asm/dma-mapping.h:81:19: error: \342\200\230struct dev_archdata\342\200\231 has no member named \342\200\230mapping\342\200\231\n"
+ "> ./arch/arm64/include/asm/dma-mapping.h: In function ?phys_to_dma?:\n"
+ "> ./arch/arm64/include/asm/dma-mapping.h:69:2: error: ?struct dev_archdata? has no member named ?mapping?\n"
+ "> ./arch/arm64/include/asm/dma-mapping.h: In function ?dma_to_phys?:\n"
+ "> ./arch/arm64/include/asm/dma-mapping.h:81:19: error: ?struct dev_archdata? has no member named ?mapping?\n"
  "> make[1]: *** [arch/arm64/kernel/asm-offsets.s] Error 1\n"
  ">\n"
  "\n"
@@ -70,11 +61,6 @@
  "of the logical dependency (I don't think my Kconfig-fu is strong enough \n"
  "to guarantee that dependency is enforced).\n"
  "\n"
- "Robin.\n"
- "\n"
- "_______________________________________________\n"
- "iommu mailing list\n"
- "iommu@lists.linux-foundation.org\n"
- https://lists.linuxfoundation.org/mailman/listinfo/iommu
+ Robin.
 
-c75b73b862b9e77a1db25145912d70c5d5b19d4ecf1adac10c4567645372cea4
+eaa3dd38d34613fc6af6349253a50e526341586e25bc8a68c0ae9c4442747649
