diff for duplicates of <20180420080313.18796-22-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index edaa641..993ddca 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -39,12 +39,12 @@ index 12ae33daf52f..e17566376934 100644
@@ -15,11 +14,11 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
#ifdef CONFIG_SPARC_LEON
- if (sparc_cpu_model = sparc_leon)
+ if (sparc_cpu_model == sparc_leon)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
- if (bus = &pci_bus_type)
+ if (bus == &pci_bus_type)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
diff --git a/a/content_digest b/N1/content_digest
index 8b4638c..149029d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,10 @@
"Subject\0[PATCH 21/22] sparc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:12 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:12 +0200\0"
+]
+[
+ "To\0unlisted-recipients:; (no To-header on input)\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
@@ -77,12 +80,12 @@
"\@\@ -15,11 +14,11 \@\@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)\n",
" {\n",
" #ifdef CONFIG_SPARC_LEON\n",
- " \tif (sparc_cpu_model = sparc_leon)\n",
+ " \tif (sparc_cpu_model == sparc_leon)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
" #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)\n",
- " \tif (bus = &pci_bus_type)\n",
+ " \tif (bus == &pci_bus_type)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
@@ -279,4 +282,4 @@
"2.17.0"
]
-986e40897444ab3895b5777c0b05b6be59861c02091b4fa4acc13c6fa5646649
+b02fa89a326df213086e99bb27d98c8b986b2d1dab998028fa05eaeb4e95b08b
diff --git a/a/1.txt b/N2/1.txt
index edaa641..993ddca 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -39,12 +39,12 @@ index 12ae33daf52f..e17566376934 100644
@@ -15,11 +14,11 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
#ifdef CONFIG_SPARC_LEON
- if (sparc_cpu_model = sparc_leon)
+ if (sparc_cpu_model == sparc_leon)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
- if (bus = &pci_bus_type)
+ if (bus == &pci_bus_type)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
diff --git a/a/content_digest b/N2/content_digest
index 8b4638c..ea48d4d 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,10 @@
"Subject\0[PATCH 21/22] sparc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:12 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:12 +0200\0"
+]
+[
+ "To\0unlisted-recipients:; (no To-header on input)\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
@@ -20,7 +23,7 @@
" linux-arm-kernel\@lists.infradead.org",
" linux-c6x-dev\@linux-c6x.org",
" linux-hexagon\@vger.kernel.org",
- " linux-m68k\@lists.linux-m68k.org",
+ " linux-m68k\@vger.kernel.org",
" nios2-dev\@lists.rocketboards.org",
" openrisc\@lists.librecores.org",
" linux-parisc\@vger.kernel.org",
@@ -77,12 +80,12 @@
"\@\@ -15,11 +14,11 \@\@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)\n",
" {\n",
" #ifdef CONFIG_SPARC_LEON\n",
- " \tif (sparc_cpu_model = sparc_leon)\n",
+ " \tif (sparc_cpu_model == sparc_leon)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
" #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)\n",
- " \tif (bus = &pci_bus_type)\n",
+ " \tif (bus == &pci_bus_type)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
@@ -279,4 +282,4 @@
"2.17.0"
]
-986e40897444ab3895b5777c0b05b6be59861c02091b4fa4acc13c6fa5646649
+bde723565b99b094f7e314faec72a7c77486a3af6e7361f848d241a5d481762f
diff --git a/a/1.txt b/N3/1.txt
index edaa641..993ddca 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -39,12 +39,12 @@ index 12ae33daf52f..e17566376934 100644
@@ -15,11 +14,11 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
#ifdef CONFIG_SPARC_LEON
- if (sparc_cpu_model = sparc_leon)
+ if (sparc_cpu_model == sparc_leon)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
- if (bus = &pci_bus_type)
+ if (bus == &pci_bus_type)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
diff --git a/a/content_digest b/N3/content_digest
index 8b4638c..42ab273 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 21/22] sparc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:12 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:12 +0200\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
@@ -77,12 +77,12 @@
"\@\@ -15,11 +14,11 \@\@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)\n",
" {\n",
" #ifdef CONFIG_SPARC_LEON\n",
- " \tif (sparc_cpu_model = sparc_leon)\n",
+ " \tif (sparc_cpu_model == sparc_leon)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
" #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)\n",
- " \tif (bus = &pci_bus_type)\n",
+ " \tif (bus == &pci_bus_type)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
@@ -279,4 +279,4 @@
"2.17.0"
]
-986e40897444ab3895b5777c0b05b6be59861c02091b4fa4acc13c6fa5646649
+d178062ebf08fa325321eb15c1ffed7fd54e8cea7493779e59e5cda63a410e06
diff --git a/a/1.txt b/N4/1.txt
index edaa641..8affcb8 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -4,7 +4,7 @@ This removes the previous sync_single_for_device implementation, which
looks bogus given that no syncing is happening in the similar but more
important map_single case.
-Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Christoph Hellwig <hch at lst.de>
---
arch/sparc/Kconfig | 2 +
arch/sparc/include/asm/dma-mapping.h | 5 +-
@@ -39,12 +39,12 @@ index 12ae33daf52f..e17566376934 100644
@@ -15,11 +14,11 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
#ifdef CONFIG_SPARC_LEON
- if (sparc_cpu_model = sparc_leon)
+ if (sparc_cpu_model == sparc_leon)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
- if (bus = &pci_bus_type)
+ if (bus == &pci_bus_type)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
diff --git a/a/content_digest b/N4/content_digest
index 8b4638c..e762984 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 21/22] sparc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:12 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:12 +0200\0"
]
[
- "Cc\0linux-arch\@vger.kernel.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-hexagon\@vger.kernel.org",
- " linux-m68k\@lists.linux-m68k.org",
- " nios2-dev\@lists.rocketboards.org",
- " openrisc\@lists.librecores.org",
- " linux-parisc\@vger.kernel.org",
- " linux-sh\@vger.kernel.org",
- " sparclinux\@vger.kernel.org",
- " linux-xtensa\@linux-xtensa.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0linux-snps-arc\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -42,7 +26,7 @@
"looks bogus given that no syncing is happening in the similar but more\n",
"important map_single case.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch at lst.de>\n",
"---\n",
" arch/sparc/Kconfig | 2 +\n",
" arch/sparc/include/asm/dma-mapping.h | 5 +-\n",
@@ -77,12 +61,12 @@
"\@\@ -15,11 +14,11 \@\@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)\n",
" {\n",
" #ifdef CONFIG_SPARC_LEON\n",
- " \tif (sparc_cpu_model = sparc_leon)\n",
+ " \tif (sparc_cpu_model == sparc_leon)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
" #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)\n",
- " \tif (bus = &pci_bus_type)\n",
+ " \tif (bus == &pci_bus_type)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
@@ -279,4 +263,4 @@
"2.17.0"
]
-986e40897444ab3895b5777c0b05b6be59861c02091b4fa4acc13c6fa5646649
+b6ebdb74e7b416fa1bf4899cf517d96cdd6b2356457d7a430724956985d300c4
diff --git a/a/1.txt b/N5/1.txt
index edaa641..993ddca 100644
--- a/a/1.txt
+++ b/N5/1.txt
@@ -39,12 +39,12 @@ index 12ae33daf52f..e17566376934 100644
@@ -15,11 +14,11 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
#ifdef CONFIG_SPARC_LEON
- if (sparc_cpu_model = sparc_leon)
+ if (sparc_cpu_model == sparc_leon)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
- if (bus = &pci_bus_type)
+ if (bus == &pci_bus_type)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
diff --git a/a/content_digest b/N5/content_digest
index 8b4638c..d64fc1f 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 21/22] sparc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:12 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:12 +0200\0"
]
[
- "Cc\0linux-arch\@vger.kernel.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-hexagon\@vger.kernel.org",
- " linux-m68k\@lists.linux-m68k.org",
- " nios2-dev\@lists.rocketboards.org",
- " openrisc\@lists.librecores.org",
- " linux-parisc\@vger.kernel.org",
- " linux-sh\@vger.kernel.org",
- " sparclinux\@vger.kernel.org",
- " linux-xtensa\@linux-xtensa.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -77,12 +61,12 @@
"\@\@ -15,11 +14,11 \@\@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)\n",
" {\n",
" #ifdef CONFIG_SPARC_LEON\n",
- " \tif (sparc_cpu_model = sparc_leon)\n",
+ " \tif (sparc_cpu_model == sparc_leon)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
" #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)\n",
- " \tif (bus = &pci_bus_type)\n",
+ " \tif (bus == &pci_bus_type)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
@@ -279,4 +263,4 @@
"2.17.0"
]
-986e40897444ab3895b5777c0b05b6be59861c02091b4fa4acc13c6fa5646649
+b394747729c4dd7fb7f5344c2a6debbc34fc5489ea7a09d7713d3974b6e87267
diff --git a/a/1.txt b/N6/1.txt
index edaa641..993ddca 100644
--- a/a/1.txt
+++ b/N6/1.txt
@@ -39,12 +39,12 @@ index 12ae33daf52f..e17566376934 100644
@@ -15,11 +14,11 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
#ifdef CONFIG_SPARC_LEON
- if (sparc_cpu_model = sparc_leon)
+ if (sparc_cpu_model == sparc_leon)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
- if (bus = &pci_bus_type)
+ if (bus == &pci_bus_type)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
diff --git a/a/content_digest b/N6/content_digest
index 8b4638c..47a1b43 100644
--- a/a/content_digest
+++ b/N6/content_digest
@@ -5,29 +5,13 @@
"From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Subject\0[PATCH 21/22] sparc: use generic dma_noncoherent_ops\0"
+ "Subject\0[OpenRISC] [PATCH 21/22] sparc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:12 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:12 +0200\0"
]
[
- "Cc\0linux-arch\@vger.kernel.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-hexagon\@vger.kernel.org",
- " linux-m68k\@lists.linux-m68k.org",
- " nios2-dev\@lists.rocketboards.org",
- " openrisc\@lists.librecores.org",
- " linux-parisc\@vger.kernel.org",
- " linux-sh\@vger.kernel.org",
- " sparclinux\@vger.kernel.org",
- " linux-xtensa\@linux-xtensa.org",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0openrisc\@lists.librecores.org\0"
]
[
"\0000:1\0"
@@ -77,12 +61,12 @@
"\@\@ -15,11 +14,11 \@\@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)\n",
" {\n",
" #ifdef CONFIG_SPARC_LEON\n",
- " \tif (sparc_cpu_model = sparc_leon)\n",
+ " \tif (sparc_cpu_model == sparc_leon)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
" #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)\n",
- " \tif (bus = &pci_bus_type)\n",
+ " \tif (bus == &pci_bus_type)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
@@ -279,4 +263,4 @@
"2.17.0"
]
-986e40897444ab3895b5777c0b05b6be59861c02091b4fa4acc13c6fa5646649
+96ac03dc121c57691d7039c1e1a1c9b20752599170e509f5bb28434e88df8d4c
diff --git a/a/1.txt b/N7/1.txt
index edaa641..993ddca 100644
--- a/a/1.txt
+++ b/N7/1.txt
@@ -39,12 +39,12 @@ index 12ae33daf52f..e17566376934 100644
@@ -15,11 +14,11 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
#ifdef CONFIG_SPARC_LEON
- if (sparc_cpu_model = sparc_leon)
+ if (sparc_cpu_model == sparc_leon)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
- if (bus = &pci_bus_type)
+ if (bus == &pci_bus_type)
- return &pci32_dma_ops;
+ return &dma_noncoherent_ops;
#endif
diff --git a/a/content_digest b/N7/content_digest
index 8b4638c..f626af9 100644
--- a/a/content_digest
+++ b/N7/content_digest
@@ -8,7 +8,10 @@
"Subject\0[PATCH 21/22] sparc: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:12 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:12 +0200\0"
+]
+[
+ "To\0\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
@@ -77,12 +80,12 @@
"\@\@ -15,11 +14,11 \@\@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)\n",
" {\n",
" #ifdef CONFIG_SPARC_LEON\n",
- " \tif (sparc_cpu_model = sparc_leon)\n",
+ " \tif (sparc_cpu_model == sparc_leon)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
" #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)\n",
- " \tif (bus = &pci_bus_type)\n",
+ " \tif (bus == &pci_bus_type)\n",
"-\t\treturn &pci32_dma_ops;\n",
"+\t\treturn &dma_noncoherent_ops;\n",
" #endif\n",
@@ -279,4 +282,4 @@
"2.17.0"
]
-986e40897444ab3895b5777c0b05b6be59861c02091b4fa4acc13c6fa5646649
+ffe422a2328cb20961b14d3753be6b2228060f0cae28b6f8ff099b13bf9e5274
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.