diff for duplicates of <20181212141556.GA4801@lst.de>
diff --git a/a/2.txt b/N1/2.txt
index 62af2a5..e69de29 100644
--- a/a/2.txt
+++ b/N1/2.txt
@@ -1,24 +0,0 @@
-From 83a4b87de6bc6a75b500c9959de88e2157fbcd7c Mon Sep 17 00:00:00 2001
-From: Christoph Hellwig <hch@lst.de>
-Date: Wed, 12 Dec 2018 15:07:49 +0100
-Subject: get_required_mask
-
----
- arch/powerpc/kernel/dma-iommu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
-index 5b15e53ee43d..2e682004959f 100644
---- a/arch/powerpc/kernel/dma-iommu.c
-+++ b/arch/powerpc/kernel/dma-iommu.c
-@@ -152,7 +152,7 @@ u64 dma_iommu_get_required_mask(struct device *dev)
- return 0;
-
- if (dev_is_pci(dev)) {
-- u64 bypass_mask = dma_nommu_get_required_mask(dev);
-+ u64 bypass_mask = dma_direct_get_required_mask(dev);
-
- if (dma_iommu_bypass_supported(dev, bypass_mask))
- return bypass_mask;
---
-2.19.2
\ No newline at end of file
diff --git a/a/3.hdr b/a/3.hdr
deleted file mode 100644
index 9776268..0000000
--- a/a/3.hdr
+++ /dev/null
@@ -1,2 +0,0 @@
-Content-Type: text/x-patch; charset=us-ascii
-Content-Disposition: attachment; filename="0002-swiotlb-dma_supported.patch"
diff --git a/a/3.txt b/a/3.txt
deleted file mode 100644
index 8578479..0000000
--- a/a/3.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-From c2579a3619575397929781a14895966cbc1d217b Mon Sep 17 00:00:00 2001
-From: Christoph Hellwig <hch@lst.de>
-Date: Wed, 12 Dec 2018 15:08:52 +0100
-Subject: swiotlb dma_supported
-
----
- arch/powerpc/kernel/dma-swiotlb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
-index aa11625c6691..52ee531c1a0d 100644
---- a/arch/powerpc/kernel/dma-swiotlb.c
-+++ b/arch/powerpc/kernel/dma-swiotlb.c
-@@ -36,7 +36,7 @@ const struct dma_map_ops powerpc_swiotlb_dma_ops = {
- .free = __dma_nommu_free_coherent,
- .map_sg = swiotlb_map_sg_attrs,
- .unmap_sg = swiotlb_unmap_sg_attrs,
-- .dma_supported = swiotlb_dma_supported,
-+ .dma_supported = dma_direct_supported,
- .map_page = swiotlb_map_page,
- .unmap_page = swiotlb_unmap_page,
- .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
---
-2.19.2
\ No newline at end of file
diff --git a/a/4.hdr b/a/4.hdr
deleted file mode 100644
index 75e8223..0000000
--- a/a/4.hdr
+++ /dev/null
@@ -1,2 +0,0 @@
-Content-Type: text/x-patch; charset=us-ascii
-Content-Disposition: attachment; filename="0003-nommu-dma_supported.patch"
diff --git a/a/4.txt b/a/4.txt
deleted file mode 100644
index eae7971..0000000
--- a/a/4.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0105db9e6d8d031b4295116630fd0318fd146737 Mon Sep 17 00:00:00 2001
-From: Christoph Hellwig <hch@lst.de>
-Date: Wed, 12 Dec 2018 15:10:36 +0100
-Subject: nommu dma_supported
-
----
- arch/powerpc/kernel/dma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
-index a6590aa77181..f53d11d35230 100644
---- a/arch/powerpc/kernel/dma.c
-+++ b/arch/powerpc/kernel/dma.c
-@@ -179,7 +179,7 @@ const struct dma_map_ops dma_nommu_ops = {
- .alloc = __dma_nommu_alloc_coherent,
- .free = __dma_nommu_free_coherent,
- .map_sg = dma_nommu_map_sg,
-- .dma_supported = dma_nommu_dma_supported,
-+ .dma_supported = dma_direct_supported,
- .map_page = dma_nommu_map_page,
- #ifdef CONFIG_NOT_COHERENT_CACHE
- .sync_single_for_cpu = dma_nommu_sync_single,
---
-2.19.2
\ No newline at end of file
diff --git a/a/5.hdr b/a/5.hdr
deleted file mode 100644
index 454cfb4..0000000
--- a/a/5.hdr
+++ /dev/null
@@ -1,2 +0,0 @@
-Content-Type: text/x-patch; charset=us-ascii
-Content-Disposition: attachment; filename="0004-alloc-free.patch"
diff --git a/a/5.txt b/a/5.txt
deleted file mode 100644
index b47582c..0000000
--- a/a/5.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4c5dd4d4a4b4e63be722fd29ada896c5962072b8 Mon Sep 17 00:00:00 2001
-From: Christoph Hellwig <hch@lst.de>
-Date: Wed, 12 Dec 2018 15:11:38 +0100
-Subject: alloc/free
-
----
- arch/powerpc/kernel/dma.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
-index f53d11d35230..d3db6d879559 100644
---- a/arch/powerpc/kernel/dma.c
-+++ b/arch/powerpc/kernel/dma.c
-@@ -176,8 +176,13 @@ static inline void dma_nommu_sync_single(struct device *dev,
- #endif
-
- const struct dma_map_ops dma_nommu_ops = {
-+#ifdef CONFIG_NOT_COHERENT_CACHE
- .alloc = __dma_nommu_alloc_coherent,
- .free = __dma_nommu_free_coherent,
-+#else
-+ .alloc = dma_direct_alloc,
-+ .free = dma_direct_free,
-+#endif
- .map_sg = dma_nommu_map_sg,
- .dma_supported = dma_direct_supported,
- .map_page = dma_nommu_map_page,
---
-2.19.2
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index feab89c..be4fda7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -75,141 +75,6 @@
[
"b\0"
]
-[
- "From 83a4b87de6bc6a75b500c9959de88e2157fbcd7c Mon Sep 17 00:00:00 2001\n",
- "From: Christoph Hellwig <hch\@lst.de>\n",
- "Date: Wed, 12 Dec 2018 15:07:49 +0100\n",
- "Subject: get_required_mask\n",
- "\n",
- "---\n",
- " arch/powerpc/kernel/dma-iommu.c | 2 +-\n",
- " 1 file changed, 1 insertion(+), 1 deletion(-)\n",
- "\n",
- "diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c\n",
- "index 5b15e53ee43d..2e682004959f 100644\n",
- "--- a/arch/powerpc/kernel/dma-iommu.c\n",
- "+++ b/arch/powerpc/kernel/dma-iommu.c\n",
- "\@\@ -152,7 +152,7 \@\@ u64 dma_iommu_get_required_mask(struct device *dev)\n",
- " \t\treturn 0;\n",
- " \n",
- " \tif (dev_is_pci(dev)) {\n",
- "-\t\tu64 bypass_mask = dma_nommu_get_required_mask(dev);\n",
- "+\t\tu64 bypass_mask = dma_direct_get_required_mask(dev);\n",
- " \n",
- " \t\tif (dma_iommu_bypass_supported(dev, bypass_mask))\n",
- " \t\t\treturn bypass_mask;\n",
- "-- \n",
- "2.19.2"
-]
-[
- "\0001:3\0"
-]
-[
- "fn\0000002-swiotlb-dma_supported.patch\0"
-]
-[
- "b\0"
-]
-[
- "From c2579a3619575397929781a14895966cbc1d217b Mon Sep 17 00:00:00 2001\n",
- "From: Christoph Hellwig <hch\@lst.de>\n",
- "Date: Wed, 12 Dec 2018 15:08:52 +0100\n",
- "Subject: swiotlb dma_supported\n",
- "\n",
- "---\n",
- " arch/powerpc/kernel/dma-swiotlb.c | 2 +-\n",
- " 1 file changed, 1 insertion(+), 1 deletion(-)\n",
- "\n",
- "diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c\n",
- "index aa11625c6691..52ee531c1a0d 100644\n",
- "--- a/arch/powerpc/kernel/dma-swiotlb.c\n",
- "+++ b/arch/powerpc/kernel/dma-swiotlb.c\n",
- "\@\@ -36,7 +36,7 \@\@ const struct dma_map_ops powerpc_swiotlb_dma_ops = {\n",
- " \t.free = __dma_nommu_free_coherent,\n",
- " \t.map_sg = swiotlb_map_sg_attrs,\n",
- " \t.unmap_sg = swiotlb_unmap_sg_attrs,\n",
- "-\t.dma_supported = swiotlb_dma_supported,\n",
- "+\t.dma_supported = dma_direct_supported,\n",
- " \t.map_page = swiotlb_map_page,\n",
- " \t.unmap_page = swiotlb_unmap_page,\n",
- " \t.sync_single_for_cpu = swiotlb_sync_single_for_cpu,\n",
- "-- \n",
- "2.19.2"
-]
-[
- "\0001:4\0"
-]
-[
- "fn\0000003-nommu-dma_supported.patch\0"
-]
-[
- "b\0"
-]
-[
- "From 0105db9e6d8d031b4295116630fd0318fd146737 Mon Sep 17 00:00:00 2001\n",
- "From: Christoph Hellwig <hch\@lst.de>\n",
- "Date: Wed, 12 Dec 2018 15:10:36 +0100\n",
- "Subject: nommu dma_supported\n",
- "\n",
- "---\n",
- " arch/powerpc/kernel/dma.c | 2 +-\n",
- " 1 file changed, 1 insertion(+), 1 deletion(-)\n",
- "\n",
- "diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c\n",
- "index a6590aa77181..f53d11d35230 100644\n",
- "--- a/arch/powerpc/kernel/dma.c\n",
- "+++ b/arch/powerpc/kernel/dma.c\n",
- "\@\@ -179,7 +179,7 \@\@ const struct dma_map_ops dma_nommu_ops = {\n",
- " \t.alloc\t\t\t\t= __dma_nommu_alloc_coherent,\n",
- " \t.free\t\t\t\t= __dma_nommu_free_coherent,\n",
- " \t.map_sg\t\t\t\t= dma_nommu_map_sg,\n",
- "-\t.dma_supported\t\t\t= dma_nommu_dma_supported,\n",
- "+\t.dma_supported\t\t\t= dma_direct_supported,\n",
- " \t.map_page\t\t\t= dma_nommu_map_page,\n",
- " #ifdef CONFIG_NOT_COHERENT_CACHE\n",
- " \t.sync_single_for_cpu \t\t= dma_nommu_sync_single,\n",
- "-- \n",
- "2.19.2"
-]
-[
- "\0001:5\0"
-]
-[
- "fn\0000004-alloc-free.patch\0"
-]
-[
- "b\0"
-]
-[
- "From 4c5dd4d4a4b4e63be722fd29ada896c5962072b8 Mon Sep 17 00:00:00 2001\n",
- "From: Christoph Hellwig <hch\@lst.de>\n",
- "Date: Wed, 12 Dec 2018 15:11:38 +0100\n",
- "Subject: alloc/free\n",
- "\n",
- "---\n",
- " arch/powerpc/kernel/dma.c | 5 +++++\n",
- " 1 file changed, 5 insertions(+)\n",
- "\n",
- "diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c\n",
- "index f53d11d35230..d3db6d879559 100644\n",
- "--- a/arch/powerpc/kernel/dma.c\n",
- "+++ b/arch/powerpc/kernel/dma.c\n",
- "\@\@ -176,8 +176,13 \@\@ static inline void dma_nommu_sync_single(struct device *dev,\n",
- " #endif\n",
- " \n",
- " const struct dma_map_ops dma_nommu_ops = {\n",
- "+#ifdef CONFIG_NOT_COHERENT_CACHE\n",
- " \t.alloc\t\t\t\t= __dma_nommu_alloc_coherent,\n",
- " \t.free\t\t\t\t= __dma_nommu_free_coherent,\n",
- "+#else\n",
- "+\t.alloc\t\t\t\t= dma_direct_alloc,\n",
- "+\t.free\t\t\t\t= dma_direct_free,\n",
- "+#endif\n",
- " \t.map_sg\t\t\t\t= dma_nommu_map_sg,\n",
- " \t.dma_supported\t\t\t= dma_direct_supported,\n",
- " \t.map_page\t\t\t= dma_nommu_map_page,\n",
- "-- \n",
- "2.19.2"
-]
+[]
-1516100b3a43c039759a3983d7587921305517471d19933cf9b2644ecccbe749
+14028e94cc764da400d824c6fb0911257f5c6c4c2c5f27ea33961b26adfe605a
diff --git a/a/2.txt b/N2/2.txt
index 62af2a5..af77463 100644
--- a/a/2.txt
+++ b/N2/2.txt
@@ -1,4 +1,4 @@
-From 83a4b87de6bc6a75b500c9959de88e2157fbcd7c Mon Sep 17 00:00:00 2001
+>From 83a4b87de6bc6a75b500c9959de88e2157fbcd7c Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 12 Dec 2018 15:07:49 +0100
Subject: get_required_mask
diff --git a/a/3.txt b/N2/3.txt
index 8578479..7cb2ca2 100644
--- a/a/3.txt
+++ b/N2/3.txt
@@ -1,4 +1,4 @@
-From c2579a3619575397929781a14895966cbc1d217b Mon Sep 17 00:00:00 2001
+>From c2579a3619575397929781a14895966cbc1d217b Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 12 Dec 2018 15:08:52 +0100
Subject: swiotlb dma_supported
diff --git a/a/4.txt b/N2/4.txt
index eae7971..61c79e0 100644
--- a/a/4.txt
+++ b/N2/4.txt
@@ -1,4 +1,4 @@
-From 0105db9e6d8d031b4295116630fd0318fd146737 Mon Sep 17 00:00:00 2001
+>From 0105db9e6d8d031b4295116630fd0318fd146737 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 12 Dec 2018 15:10:36 +0100
Subject: nommu dma_supported
diff --git a/a/5.txt b/N2/5.txt
index b47582c..ad8642b 100644
--- a/a/5.txt
+++ b/N2/5.txt
@@ -1,4 +1,4 @@
-From 4c5dd4d4a4b4e63be722fd29ada896c5962072b8 Mon Sep 17 00:00:00 2001
+>From 4c5dd4d4a4b4e63be722fd29ada896c5962072b8 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 12 Dec 2018 15:11:38 +0100
Subject: alloc/free
diff --git a/a/content_digest b/N2/content_digest
index feab89c..cee0170 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -76,7 +76,7 @@
"b\0"
]
[
- "From 83a4b87de6bc6a75b500c9959de88e2157fbcd7c Mon Sep 17 00:00:00 2001\n",
+ ">From 83a4b87de6bc6a75b500c9959de88e2157fbcd7c Mon Sep 17 00:00:00 2001\n",
"From: Christoph Hellwig <hch\@lst.de>\n",
"Date: Wed, 12 Dec 2018 15:07:49 +0100\n",
"Subject: get_required_mask\n",
@@ -111,7 +111,7 @@
"b\0"
]
[
- "From c2579a3619575397929781a14895966cbc1d217b Mon Sep 17 00:00:00 2001\n",
+ ">From c2579a3619575397929781a14895966cbc1d217b Mon Sep 17 00:00:00 2001\n",
"From: Christoph Hellwig <hch\@lst.de>\n",
"Date: Wed, 12 Dec 2018 15:08:52 +0100\n",
"Subject: swiotlb dma_supported\n",
@@ -146,7 +146,7 @@
"b\0"
]
[
- "From 0105db9e6d8d031b4295116630fd0318fd146737 Mon Sep 17 00:00:00 2001\n",
+ ">From 0105db9e6d8d031b4295116630fd0318fd146737 Mon Sep 17 00:00:00 2001\n",
"From: Christoph Hellwig <hch\@lst.de>\n",
"Date: Wed, 12 Dec 2018 15:10:36 +0100\n",
"Subject: nommu dma_supported\n",
@@ -181,7 +181,7 @@
"b\0"
]
[
- "From 4c5dd4d4a4b4e63be722fd29ada896c5962072b8 Mon Sep 17 00:00:00 2001\n",
+ ">From 4c5dd4d4a4b4e63be722fd29ada896c5962072b8 Mon Sep 17 00:00:00 2001\n",
"From: Christoph Hellwig <hch\@lst.de>\n",
"Date: Wed, 12 Dec 2018 15:11:38 +0100\n",
"Subject: alloc/free\n",
@@ -212,4 +212,4 @@
"2.19.2"
]
-1516100b3a43c039759a3983d7587921305517471d19933cf9b2644ecccbe749
+b5ad1dd8248bd2b5c39b738dc96cc5a409e80139a1190790331e7b41be87cf3f
diff --git a/a/content_digest b/N3/content_digest
index feab89c..b7ea0cc 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -41,8 +41,7 @@
"To\0Christian Zigotzky <chzigotzky\@xenosoft.de>\0"
]
[
- "Cc\0Christoph Hellwig <hch\@lst.de>",
- " linux-arch\@vger.kernel.org",
+ "Cc\0linux-arch\@vger.kernel.org",
" Darren Stevens <darren\@stevens-zone.net>",
" linux-kernel\@vger.kernel.org",
" Julian Margetson <runaway\@candw.ms>",
@@ -50,7 +49,8 @@
" iommu\@lists.linux-foundation.org",
" Paul Mackerras <paulus\@samba.org>",
" Olof Johansson <olof\@lixom.net>",
- " linuxppc-dev\@lists.ozlabs.org\0"
+ " linuxppc-dev\@lists.ozlabs.org",
+ " Christoph Hellwig <hch\@lst.de>\0"
]
[
"\0001:1\0"
@@ -212,4 +212,4 @@
"2.19.2"
]
-1516100b3a43c039759a3983d7587921305517471d19933cf9b2644ecccbe749
+2af9ad2510d00382b0d4e6d6dcb0747506e940283cf844005199c2f60474ec0b
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.