diff for duplicates of <20180727210548.GA1476@ravnborg.org> diff --git a/a/1.txt b/N1/1.txt index c2c224a..edc1b59 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,7 @@ I really like how you managed to kill a lot of code with this patch. You can add my: -Acked-by: Sam Ravnborg <sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org> +Acked-by: Sam Ravnborg <sam@ravnborg.org> But that does imply that this is OK, you must wait for davem. @@ -26,7 +26,7 @@ On Fri, Jul 27, 2018 at 06:44:09PM +0200, Christoph Hellwig wrote: > looks bogus given that no syncing is happening in the similar but more > important map_single case. > -> Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> +> Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/sparc/Kconfig | 2 + > arch/sparc/include/asm/dma-mapping.h | 5 +- @@ -65,12 +65,12 @@ You addressed this in the changelog - so I guess it is OK. > @@ -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 ed7e03a..2dccb33 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\020180727164409.14873-1-hch@lst.de\0" "ref\020180727164409.14873-2-hch@lst.de\0" "ref\020180727164409.14873-2-hch-jcswGhMUV9g@public.gmane.org\0" - "From\0Sam Ravnborg <sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>\0" + "From\0Sam Ravnborg <sam@ravnborg.org>\0" "Subject\0Re: [PATCH] sparc: use generic dma_noncoherent_ops\0" - "Date\0Fri, 27 Jul 2018 23:05:48 +0200\0" + "Date\0Fri, 27 Jul 2018 21:05:48 +0000\0" "To\0Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>\0" "Cc\0sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org @@ -24,7 +24,7 @@ "with this patch.\n" "\n" "You can add my:\n" - "Acked-by: Sam Ravnborg <sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>\n" + "Acked-by: Sam Ravnborg <sam@ravnborg.org>\n" "\n" "But that does imply that this is OK, you\n" "must wait for davem.\n" @@ -38,7 +38,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-jcswGhMUV9g@public.gmane.org>\n" + "> Signed-off-by: Christoph Hellwig <hch@lst.de>\n" "> ---\n" "> arch/sparc/Kconfig | 2 +\n" "> arch/sparc/include/asm/dma-mapping.h | 5 +-\n" @@ -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" @@ -127,4 +127,4 @@ "> +\t\tunsigned long attrs)\n" Likewise, use arch_dma_free in printk statements -1130cba5af8e2585b6bf188159a49a34cdbcf06eb34d9c6c50637ec8abf85ad4 +2006878bcd78e02321fdaa20139ea2674c5894a5a7ce3b4b05475396ef367aec
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.