diff for duplicates of <20180420080313.18796-7-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index 5527bea..bb76e86 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -73,7 +73,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -16,13 +16,12 @@
- * The default DMA address = Phy address which is 0x8000_0000 based.
+ * The default DMA address == Phy address which is 0x8000_0000 based.
*/
-#include <linux/dma-mapping.h>
@@ -235,7 +235,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
-static int arc_dma_supported(struct device *dev, u64 dma_mask)
-{
- /* Support 32 bit DMA mask exclusively */
-- return dma_mask = DMA_BIT_MASK(32);
+- return dma_mask == DMA_BIT_MASK(32);
-}
-
-const struct dma_map_ops arc_dma_ops = {
diff --git a/a/content_digest b/N1/content_digest
index 2ded099..2dfc8cc 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 06/22] arc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:02:57 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:02:57 +0200\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
@@ -111,7 +111,7 @@
"--- a/arch/arc/mm/dma.c\n",
"+++ b/arch/arc/mm/dma.c\n",
"\@\@ -16,13 +16,12 \@\@\n",
- " * The default DMA address = Phy address which is 0x8000_0000 based.\n",
+ " * The default DMA address == Phy address which is 0x8000_0000 based.\n",
" */\n",
" \n",
"-#include <linux/dma-mapping.h>\n",
@@ -273,7 +273,7 @@
"-static int arc_dma_supported(struct device *dev, u64 dma_mask)\n",
"-{\n",
"-\t/* Support 32 bit DMA mask exclusively */\n",
- "-\treturn dma_mask = DMA_BIT_MASK(32);\n",
+ "-\treturn dma_mask == DMA_BIT_MASK(32);\n",
"-}\n",
"-\n",
"-const struct dma_map_ops arc_dma_ops = {\n",
@@ -295,4 +295,4 @@
"2.17.0"
]
-8557cbee4e4aef33b1b0b1b48d9dc663baaac6cd3737bd4474cccb283d693086
+c06e708b435266d9e9683f00d154c258922e042323a11647b19edb15d54391c0
diff --git a/a/1.txt b/N2/1.txt
index 5527bea..bb76e86 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -73,7 +73,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -16,13 +16,12 @@
- * The default DMA address = Phy address which is 0x8000_0000 based.
+ * The default DMA address == Phy address which is 0x8000_0000 based.
*/
-#include <linux/dma-mapping.h>
@@ -235,7 +235,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
-static int arc_dma_supported(struct device *dev, u64 dma_mask)
-{
- /* Support 32 bit DMA mask exclusively */
-- return dma_mask = DMA_BIT_MASK(32);
+- return dma_mask == DMA_BIT_MASK(32);
-}
-
-const struct dma_map_ops arc_dma_ops = {
diff --git a/a/content_digest b/N2/content_digest
index 2ded099..d6acc1a 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,26 +8,29 @@
"Subject\0[PATCH 06/22] arc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:02:57 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:02:57 +0200\0"
+]
+[
+ "To\0unlisted-recipients:; (no To-header on input)\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
- " linux-xtensa\@linux-xtensa.org",
" Michal Simek <monstr\@monstr.eu>",
+ " Greentime Hu <green.hu\@gmail.com>",
" Vincent Chen <deanbo422\@gmail.com>",
+ " linux-alpha\@vger.kernel.org",
+ " linux-snps-arc\@lists.infradead.org",
+ " linux-arm-kernel\@lists.infradead.org",
" linux-c6x-dev\@linux-c6x.org",
- " linux-parisc\@vger.kernel.org",
- " linux-sh\@vger.kernel.org",
" linux-hexagon\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-m68k\@lists.linux-m68k.org",
+ " linux-m68k\@vger.kernel.org",
+ " nios2-dev\@lists.rocketboards.org",
" openrisc\@lists.librecores.org",
- " Greentime Hu <green.hu\@gmail.com>",
- " linux-alpha\@vger.kernel.org",
+ " linux-parisc\@vger.kernel.org",
+ " linux-sh\@vger.kernel.org",
" sparclinux\@vger.kernel.org",
- " nios2-dev\@lists.rocketboards.org",
- " linux-snps-arc\@lists.infradead.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ " linux-xtensa\@linux-xtensa.org",
+ " linux-kernel\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -111,7 +114,7 @@
"--- a/arch/arc/mm/dma.c\n",
"+++ b/arch/arc/mm/dma.c\n",
"\@\@ -16,13 +16,12 \@\@\n",
- " * The default DMA address = Phy address which is 0x8000_0000 based.\n",
+ " * The default DMA address == Phy address which is 0x8000_0000 based.\n",
" */\n",
" \n",
"-#include <linux/dma-mapping.h>\n",
@@ -273,7 +276,7 @@
"-static int arc_dma_supported(struct device *dev, u64 dma_mask)\n",
"-{\n",
"-\t/* Support 32 bit DMA mask exclusively */\n",
- "-\treturn dma_mask = DMA_BIT_MASK(32);\n",
+ "-\treturn dma_mask == DMA_BIT_MASK(32);\n",
"-}\n",
"-\n",
"-const struct dma_map_ops arc_dma_ops = {\n",
@@ -295,4 +298,4 @@
"2.17.0"
]
-8557cbee4e4aef33b1b0b1b48d9dc663baaac6cd3737bd4474cccb283d693086
+5cbd9085e90e7e35907aa41bc6820b1a5b440ef6978b0dffcba915e17e95db2a
diff --git a/a/1.txt b/N3/1.txt
index 5527bea..bb76e86 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -73,7 +73,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -16,13 +16,12 @@
- * The default DMA address = Phy address which is 0x8000_0000 based.
+ * The default DMA address == Phy address which is 0x8000_0000 based.
*/
-#include <linux/dma-mapping.h>
@@ -235,7 +235,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
-static int arc_dma_supported(struct device *dev, u64 dma_mask)
-{
- /* Support 32 bit DMA mask exclusively */
-- return dma_mask = DMA_BIT_MASK(32);
+- return dma_mask == DMA_BIT_MASK(32);
-}
-
-const struct dma_map_ops arc_dma_ops = {
diff --git a/a/content_digest b/N3/content_digest
index 2ded099..982ab92 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -8,26 +8,26 @@
"Subject\0[PATCH 06/22] arc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:02:57 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:02:57 +0200\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
- " linux-xtensa\@linux-xtensa.org",
" Michal Simek <monstr\@monstr.eu>",
+ " Greentime Hu <green.hu\@gmail.com>",
" Vincent Chen <deanbo422\@gmail.com>",
+ " linux-alpha\@vger.kernel.org",
+ " linux-snps-arc\@lists.infradead.org",
+ " linux-arm-kernel\@lists.infradead.org",
" linux-c6x-dev\@linux-c6x.org",
- " linux-parisc\@vger.kernel.org",
- " linux-sh\@vger.kernel.org",
" linux-hexagon\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
" linux-m68k\@lists.linux-m68k.org",
+ " nios2-dev\@lists.rocketboards.org",
" openrisc\@lists.librecores.org",
- " Greentime Hu <green.hu\@gmail.com>",
- " linux-alpha\@vger.kernel.org",
+ " linux-parisc\@vger.kernel.org",
+ " linux-sh\@vger.kernel.org",
" sparclinux\@vger.kernel.org",
- " nios2-dev\@lists.rocketboards.org",
- " linux-snps-arc\@lists.infradead.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ " linux-xtensa\@linux-xtensa.org",
+ " linux-kernel\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -111,7 +111,7 @@
"--- a/arch/arc/mm/dma.c\n",
"+++ b/arch/arc/mm/dma.c\n",
"\@\@ -16,13 +16,12 \@\@\n",
- " * The default DMA address = Phy address which is 0x8000_0000 based.\n",
+ " * The default DMA address == Phy address which is 0x8000_0000 based.\n",
" */\n",
" \n",
"-#include <linux/dma-mapping.h>\n",
@@ -273,7 +273,7 @@
"-static int arc_dma_supported(struct device *dev, u64 dma_mask)\n",
"-{\n",
"-\t/* Support 32 bit DMA mask exclusively */\n",
- "-\treturn dma_mask = DMA_BIT_MASK(32);\n",
+ "-\treturn dma_mask == DMA_BIT_MASK(32);\n",
"-}\n",
"-\n",
"-const struct dma_map_ops arc_dma_ops = {\n",
@@ -295,4 +295,4 @@
"2.17.0"
]
-8557cbee4e4aef33b1b0b1b48d9dc663baaac6cd3737bd4474cccb283d693086
+34bf50bafc80ec9d4396831fb01d0edf853e455f501c30243bcaea1f10020da1
diff --git a/a/1.txt b/N4/1.txt
index 5527bea..6881244 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -1,6 +1,6 @@
Switch to the generic noncoherent direct mapping implementation.
-Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Christoph Hellwig <hch at lst.de>
---
arch/arc/Kconfig | 4 +
arch/arc/include/asm/Kbuild | 1 +
@@ -73,7 +73,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -16,13 +16,12 @@
- * The default DMA address = Phy address which is 0x8000_0000 based.
+ * The default DMA address == Phy address which is 0x8000_0000 based.
*/
-#include <linux/dma-mapping.h>
@@ -235,7 +235,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
-static int arc_dma_supported(struct device *dev, u64 dma_mask)
-{
- /* Support 32 bit DMA mask exclusively */
-- return dma_mask = DMA_BIT_MASK(32);
+- return dma_mask == DMA_BIT_MASK(32);
-}
-
-const struct dma_map_ops arc_dma_ops = {
diff --git a/a/content_digest b/N4/content_digest
index 2ded099..33cd6cc 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -2,32 +2,16 @@
"ref\00020180420080313.18796-1-hch\@lst.de\0"
]
[
- "From\0Christoph Hellwig <hch\@lst.de>\0"
+ "From\0hch\@lst.de (Christoph Hellwig)\0"
]
[
"Subject\0[PATCH 06/22] arc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:02:57 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:02:57 +0200\0"
]
[
- "Cc\0linux-arch\@vger.kernel.org",
- " linux-xtensa\@linux-xtensa.org",
- " Michal Simek <monstr\@monstr.eu>",
- " Vincent Chen <deanbo422\@gmail.com>",
- " linux-c6x-dev\@linux-c6x.org",
- " linux-parisc\@vger.kernel.org",
- " linux-sh\@vger.kernel.org",
- " linux-hexagon\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-m68k\@lists.linux-m68k.org",
- " openrisc\@lists.librecores.org",
- " Greentime Hu <green.hu\@gmail.com>",
- " linux-alpha\@vger.kernel.org",
- " sparclinux\@vger.kernel.org",
- " nios2-dev\@lists.rocketboards.org",
- " linux-snps-arc\@lists.infradead.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-snps-arc\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -38,7 +22,7 @@
[
"Switch to the generic noncoherent direct mapping implementation.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch at lst.de>\n",
"---\n",
" arch/arc/Kconfig | 4 +\n",
" arch/arc/include/asm/Kbuild | 1 +\n",
@@ -111,7 +95,7 @@
"--- a/arch/arc/mm/dma.c\n",
"+++ b/arch/arc/mm/dma.c\n",
"\@\@ -16,13 +16,12 \@\@\n",
- " * The default DMA address = Phy address which is 0x8000_0000 based.\n",
+ " * The default DMA address == Phy address which is 0x8000_0000 based.\n",
" */\n",
" \n",
"-#include <linux/dma-mapping.h>\n",
@@ -273,7 +257,7 @@
"-static int arc_dma_supported(struct device *dev, u64 dma_mask)\n",
"-{\n",
"-\t/* Support 32 bit DMA mask exclusively */\n",
- "-\treturn dma_mask = DMA_BIT_MASK(32);\n",
+ "-\treturn dma_mask == DMA_BIT_MASK(32);\n",
"-}\n",
"-\n",
"-const struct dma_map_ops arc_dma_ops = {\n",
@@ -295,4 +279,4 @@
"2.17.0"
]
-8557cbee4e4aef33b1b0b1b48d9dc663baaac6cd3737bd4474cccb283d693086
+a34de71b909d8c9c0cc09058fbdcd131ffbfabab808ea8655c4cc4e47e2ad281
diff --git a/a/1.txt b/N5/1.txt
index 5527bea..bb76e86 100644
--- a/a/1.txt
+++ b/N5/1.txt
@@ -73,7 +73,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -16,13 +16,12 @@
- * The default DMA address = Phy address which is 0x8000_0000 based.
+ * The default DMA address == Phy address which is 0x8000_0000 based.
*/
-#include <linux/dma-mapping.h>
@@ -235,7 +235,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
-static int arc_dma_supported(struct device *dev, u64 dma_mask)
-{
- /* Support 32 bit DMA mask exclusively */
-- return dma_mask = DMA_BIT_MASK(32);
+- return dma_mask == DMA_BIT_MASK(32);
-}
-
-const struct dma_map_ops arc_dma_ops = {
diff --git a/a/content_digest b/N5/content_digest
index 2ded099..ad7b0cb 100644
--- a/a/content_digest
+++ b/N5/content_digest
@@ -2,32 +2,16 @@
"ref\00020180420080313.18796-1-hch\@lst.de\0"
]
[
- "From\0Christoph Hellwig <hch\@lst.de>\0"
+ "From\0hch\@lst.de (Christoph Hellwig)\0"
]
[
"Subject\0[PATCH 06/22] arc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:02:57 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:02:57 +0200\0"
]
[
- "Cc\0linux-arch\@vger.kernel.org",
- " linux-xtensa\@linux-xtensa.org",
- " Michal Simek <monstr\@monstr.eu>",
- " Vincent Chen <deanbo422\@gmail.com>",
- " linux-c6x-dev\@linux-c6x.org",
- " linux-parisc\@vger.kernel.org",
- " linux-sh\@vger.kernel.org",
- " linux-hexagon\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-m68k\@lists.linux-m68k.org",
- " openrisc\@lists.librecores.org",
- " Greentime Hu <green.hu\@gmail.com>",
- " linux-alpha\@vger.kernel.org",
- " sparclinux\@vger.kernel.org",
- " nios2-dev\@lists.rocketboards.org",
- " linux-snps-arc\@lists.infradead.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -111,7 +95,7 @@
"--- a/arch/arc/mm/dma.c\n",
"+++ b/arch/arc/mm/dma.c\n",
"\@\@ -16,13 +16,12 \@\@\n",
- " * The default DMA address = Phy address which is 0x8000_0000 based.\n",
+ " * The default DMA address == Phy address which is 0x8000_0000 based.\n",
" */\n",
" \n",
"-#include <linux/dma-mapping.h>\n",
@@ -273,7 +257,7 @@
"-static int arc_dma_supported(struct device *dev, u64 dma_mask)\n",
"-{\n",
"-\t/* Support 32 bit DMA mask exclusively */\n",
- "-\treturn dma_mask = DMA_BIT_MASK(32);\n",
+ "-\treturn dma_mask == DMA_BIT_MASK(32);\n",
"-}\n",
"-\n",
"-const struct dma_map_ops arc_dma_ops = {\n",
@@ -295,4 +279,4 @@
"2.17.0"
]
-8557cbee4e4aef33b1b0b1b48d9dc663baaac6cd3737bd4474cccb283d693086
+41596f19e9ea3704bce0f57bf7ef37e1bf83fe41f10b050832b3189d3587f07b
diff --git a/a/1.txt b/N6/1.txt
index 5527bea..bb76e86 100644
--- a/a/1.txt
+++ b/N6/1.txt
@@ -73,7 +73,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -16,13 +16,12 @@
- * The default DMA address = Phy address which is 0x8000_0000 based.
+ * The default DMA address == Phy address which is 0x8000_0000 based.
*/
-#include <linux/dma-mapping.h>
@@ -235,7 +235,7 @@ index 1dcc404b5aec..ecfeb5585cc7 100644
-static int arc_dma_supported(struct device *dev, u64 dma_mask)
-{
- /* Support 32 bit DMA mask exclusively */
-- return dma_mask = DMA_BIT_MASK(32);
+- return dma_mask == DMA_BIT_MASK(32);
-}
-
-const struct dma_map_ops arc_dma_ops = {
diff --git a/a/content_digest b/N6/content_digest
index 2ded099..e44460d 100644
--- a/a/content_digest
+++ b/N6/content_digest
@@ -5,29 +5,13 @@
"From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Subject\0[PATCH 06/22] arc: use generic dma_noncoherent_ops\0"
+ "Subject\0[OpenRISC] [PATCH 06/22] arc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:02:57 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:02:57 +0200\0"
]
[
- "Cc\0linux-arch\@vger.kernel.org",
- " linux-xtensa\@linux-xtensa.org",
- " Michal Simek <monstr\@monstr.eu>",
- " Vincent Chen <deanbo422\@gmail.com>",
- " linux-c6x-dev\@linux-c6x.org",
- " linux-parisc\@vger.kernel.org",
- " linux-sh\@vger.kernel.org",
- " linux-hexagon\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-m68k\@lists.linux-m68k.org",
- " openrisc\@lists.librecores.org",
- " Greentime Hu <green.hu\@gmail.com>",
- " linux-alpha\@vger.kernel.org",
- " sparclinux\@vger.kernel.org",
- " nios2-dev\@lists.rocketboards.org",
- " linux-snps-arc\@lists.infradead.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0openrisc\@lists.librecores.org\0"
]
[
"\0000:1\0"
@@ -111,7 +95,7 @@
"--- a/arch/arc/mm/dma.c\n",
"+++ b/arch/arc/mm/dma.c\n",
"\@\@ -16,13 +16,12 \@\@\n",
- " * The default DMA address = Phy address which is 0x8000_0000 based.\n",
+ " * The default DMA address == Phy address which is 0x8000_0000 based.\n",
" */\n",
" \n",
"-#include <linux/dma-mapping.h>\n",
@@ -273,7 +257,7 @@
"-static int arc_dma_supported(struct device *dev, u64 dma_mask)\n",
"-{\n",
"-\t/* Support 32 bit DMA mask exclusively */\n",
- "-\treturn dma_mask = DMA_BIT_MASK(32);\n",
+ "-\treturn dma_mask == DMA_BIT_MASK(32);\n",
"-}\n",
"-\n",
"-const struct dma_map_ops arc_dma_ops = {\n",
@@ -295,4 +279,4 @@
"2.17.0"
]
-8557cbee4e4aef33b1b0b1b48d9dc663baaac6cd3737bd4474cccb283d693086
+b180778354a560140a7c3696bcf75e1ab83526df70268a11786c06eea6c92c32
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.