diff for duplicates of <20180420080313.18796-4-hch@lst.de> diff --git a/a/content_digest b/N1/content_digest index 580a560..dce38c3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,6 @@ "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0[PATCH 03/22] dma-mapping: provide a generic dma-noncoherent implementation\0" "Date\0Fri, 20 Apr 2018 10:02:54 +0200\0" - "To\0\0" "Cc\0linux-arch@vger.kernel.org" Michal Simek <monstr@monstr.eu> Greentime Hu <green.hu@gmail.com> @@ -358,4 +357,4 @@ "-- \n" 2.17.0 -29bc741f354ed763fe063b9976a740a17aeed1fae922ed6dd9efcf8dfab68d14 +999c3d158093815d1eecf36a40e0cfcae178540491a9cf58a38f7ddfa9454381
diff --git a/a/content_digest b/N2/content_digest index 580a560..0d28651 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0[PATCH 03/22] dma-mapping: provide a generic dma-noncoherent implementation\0" "Date\0Fri, 20 Apr 2018 10:02:54 +0200\0" - "To\0\0" + "To\0unlisted-recipients:; (no To-header on input)\0" "Cc\0linux-arch@vger.kernel.org" Michal Simek <monstr@monstr.eu> Greentime Hu <green.hu@gmail.com> @@ -358,4 +358,4 @@ "-- \n" 2.17.0 -29bc741f354ed763fe063b9976a740a17aeed1fae922ed6dd9efcf8dfab68d14 +3714bd573f1ae9538fb95cd0c3b3117a8ec32e015061a1b5b718e3340c154824
diff --git a/a/1.txt b/N3/1.txt index a6994e5..d2fbf56 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -7,7 +7,7 @@ to the device and/or CPU, and can provide optional implementations of the coherent mmap functionality, and the cache_flush routines for non-coherent long term allocations. -Signed-off-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Christoph Hellwig <hch at lst.de> --- MAINTAINERS | 2 + include/asm-generic/dma-mapping.h | 9 +++ @@ -40,7 +40,7 @@ index b60179d948bb..bbaf5459d297 100644 +F: include/linux/dma-noncoherent.h DME1737 HARDWARE MONITOR DRIVER - M: Juerg Haefliger <juergh@gmail.com> + M: Juerg Haefliger <juergh at gmail.com> diff --git a/include/asm-generic/dma-mapping.h b/include/asm-generic/dma-mapping.h index 880a292d792f..ad2868263867 100644 --- a/include/asm-generic/dma-mapping.h diff --git a/a/content_digest b/N3/content_digest index 580a560..6c8d186 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,25 +1,8 @@ "ref\020180420080313.18796-1-hch@lst.de\0" - "From\0Christoph Hellwig <hch@lst.de>\0" + "From\0hch@lst.de (Christoph Hellwig)\0" "Subject\0[PATCH 03/22] dma-mapping: provide a generic dma-noncoherent implementation\0" "Date\0Fri, 20 Apr 2018 10:02:54 +0200\0" - "To\0\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" "\00:1\0" "b\0" "Add a new dma_map_ops implementation that uses dma-direct for the\n" @@ -31,7 +14,7 @@ "the coherent mmap functionality, and the cache_flush routines for\n" "non-coherent long term allocations.\n" "\n" - "Signed-off-by: Christoph Hellwig <hch@lst.de>\n" + "Signed-off-by: Christoph Hellwig <hch at lst.de>\n" "---\n" " MAINTAINERS | 2 +\n" " include/asm-generic/dma-mapping.h | 9 +++\n" @@ -64,7 +47,7 @@ "+F:\tinclude/linux/dma-noncoherent.h\n" " \n" " DME1737 HARDWARE MONITOR DRIVER\n" - " M:\tJuerg Haefliger <juergh@gmail.com>\n" + " M:\tJuerg Haefliger <juergh at gmail.com>\n" "diff --git a/include/asm-generic/dma-mapping.h b/include/asm-generic/dma-mapping.h\n" "index 880a292d792f..ad2868263867 100644\n" "--- a/include/asm-generic/dma-mapping.h\n" @@ -358,4 +341,4 @@ "-- \n" 2.17.0 -29bc741f354ed763fe063b9976a740a17aeed1fae922ed6dd9efcf8dfab68d14 +224363097b499ef21c3594a97075e8bf1881c5a7ad320f32fd6a9786af1984f6
diff --git a/a/1.txt b/N4/1.txt index a6994e5..8f75c60 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -90,7 +90,7 @@ index 25a9a2b04f78..4be070df5fc5 100644 +extern const struct dma_map_ops dma_noncoherent_ops; extern const struct dma_map_ops dma_virt_ops; - #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) + #define DMA_BIT_MASK(n) (((n) = 64) ? ~0ULL : ((1ULL<<(n))-1)) diff --git a/include/linux/dma-noncoherent.h b/include/linux/dma-noncoherent.h new file mode 100644 index 000000000000..10b2654d549b @@ -222,7 +222,7 @@ index 199ae4cdd28f..9abb93541dfe 100644 -static int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr) +int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr) { - return dma_addr == DIRECT_MAPPING_ERROR; + return dma_addr = DIRECT_MAPPING_ERROR; } diff --git a/lib/dma-noncoherent.c b/lib/dma-noncoherent.c new file mode 100644 diff --git a/a/content_digest b/N4/content_digest index 580a560..32dafb0 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,8 +1,7 @@ "ref\020180420080313.18796-1-hch@lst.de\0" "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0[PATCH 03/22] dma-mapping: provide a generic dma-noncoherent implementation\0" - "Date\0Fri, 20 Apr 2018 10:02:54 +0200\0" - "To\0\0" + "Date\0Fri, 20 Apr 2018 08:02:54 +0000\0" "Cc\0linux-arch@vger.kernel.org" Michal Simek <monstr@monstr.eu> Greentime Hu <green.hu@gmail.com> @@ -114,7 +113,7 @@ "+extern const struct dma_map_ops dma_noncoherent_ops;\n" " extern const struct dma_map_ops dma_virt_ops;\n" " \n" - " #define DMA_BIT_MASK(n)\t(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))\n" + " #define DMA_BIT_MASK(n)\t(((n) = 64) ? ~0ULL : ((1ULL<<(n))-1))\n" "diff --git a/include/linux/dma-noncoherent.h b/include/linux/dma-noncoherent.h\n" "new file mode 100644\n" "index 000000000000..10b2654d549b\n" @@ -246,7 +245,7 @@ "-static int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr)\n" "+int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr)\n" " {\n" - " \treturn dma_addr == DIRECT_MAPPING_ERROR;\n" + " \treturn dma_addr = DIRECT_MAPPING_ERROR;\n" " }\n" "diff --git a/lib/dma-noncoherent.c b/lib/dma-noncoherent.c\n" "new file mode 100644\n" @@ -358,4 +357,4 @@ "-- \n" 2.17.0 -29bc741f354ed763fe063b9976a740a17aeed1fae922ed6dd9efcf8dfab68d14 +8635e7cc943cdbfe7eb5249de02549bbd2aad14b299937e6b7f8686138194581
diff --git a/a/content_digest b/N5/content_digest index 580a560..c89707b 100644 --- a/a/content_digest +++ b/N5/content_digest @@ -1,25 +1,8 @@ "ref\020180420080313.18796-1-hch@lst.de\0" "From\0Christoph Hellwig <hch@lst.de>\0" - "Subject\0[PATCH 03/22] dma-mapping: provide a generic dma-noncoherent implementation\0" + "Subject\0[OpenRISC] [PATCH 03/22] dma-mapping: provide a generic dma-noncoherent implementation\0" "Date\0Fri, 20 Apr 2018 10:02:54 +0200\0" - "To\0\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" "\00:1\0" "b\0" "Add a new dma_map_ops implementation that uses dma-direct for the\n" @@ -358,4 +341,4 @@ "-- \n" 2.17.0 -29bc741f354ed763fe063b9976a740a17aeed1fae922ed6dd9efcf8dfab68d14 +f73e41a826ef4c98f3b64c62c31a91a92de51a9e5154063ddd39522fad6d90ca
diff --git a/a/content_digest b/N6/content_digest index 580a560..ccf182f 100644 --- a/a/content_digest +++ b/N6/content_digest @@ -1,25 +1,8 @@ "ref\020180420080313.18796-1-hch@lst.de\0" - "From\0Christoph Hellwig <hch@lst.de>\0" + "From\0hch@lst.de (Christoph Hellwig)\0" "Subject\0[PATCH 03/22] dma-mapping: provide a generic dma-noncoherent implementation\0" "Date\0Fri, 20 Apr 2018 10:02:54 +0200\0" - "To\0\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" "\00:1\0" "b\0" "Add a new dma_map_ops implementation that uses dma-direct for the\n" @@ -358,4 +341,4 @@ "-- \n" 2.17.0 -29bc741f354ed763fe063b9976a740a17aeed1fae922ed6dd9efcf8dfab68d14 +e6e51e286480c3166cff61ae2d798143f9d73b6864de63c39ebb4bd2b90559e9
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.