diff for duplicates of <20181214114719.GA3316@lst.de> diff --git a/a/1.txt b/N1/1.txt index bcf9946..b47e9a0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ to improve the m68k dma allocator if I can get enough reviewers/testers: Compile tested only patch below: -- -From ade86dc75b9850daf9111ebf9ce15825a6144f2d Mon Sep 17 00:00:00 2001 +>From ade86dc75b9850daf9111ebf9ce15825a6144f2d Mon Sep 17 00:00:00 2001 From: Christoph Hellwig <hch@lst.de> Date: Fri, 14 Dec 2018 12:41:45 +0100 Subject: m68k: use the generic dma coherent remap allocator diff --git a/a/content_digest b/N1/content_digest index d7d1bc5..bb42467 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -50,7 +50,7 @@ "Compile tested only patch below:\n" "\n" "--\n" - "From ade86dc75b9850daf9111ebf9ce15825a6144f2d Mon Sep 17 00:00:00 2001\n" + ">From ade86dc75b9850daf9111ebf9ce15825a6144f2d Mon Sep 17 00:00:00 2001\n" "From: Christoph Hellwig <hch@lst.de>\n" "Date: Fri, 14 Dec 2018 12:41:45 +0100\n" "Subject: m68k: use the generic dma coherent remap allocator\n" @@ -165,4 +165,4 @@ "-- \n" 2.19.2 -146219fa4f56934b1bd551749669ff6735df96554d7277414dd58d32e1e7acb7 +8bfff2b4a7f71e4c93ddf7a25a315a6607b6cde67a5053836e61a1979603665b
diff --git a/a/1.txt b/N2/1.txt index bcf9946..ef524b3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -On Fri, Dec 14, 2018 at 10:54:32AM +0100, Geert Uytterhoeven wrote: +On Fri, Dec 14, 2018@10:54:32AM +0100, Geert Uytterhoeven wrote: > > - page = alloc_pages(flag, order); > > + page = alloc_pages(flag | GFP_ZERO, order); > > if (!page) @@ -27,7 +27,7 @@ to improve the m68k dma allocator if I can get enough reviewers/testers: Compile tested only patch below: -- -From ade86dc75b9850daf9111ebf9ce15825a6144f2d Mon Sep 17 00:00:00 2001 +>From ade86dc75b9850daf9111ebf9ce15825a6144f2d Mon Sep 17 00:00:00 2001 From: Christoph Hellwig <hch@lst.de> Date: Fri, 14 Dec 2018 12:41:45 +0100 Subject: m68k: use the generic dma coherent remap allocator @@ -36,7 +36,7 @@ This switche to using common code for the DMA allocations, including potential use of the CMA allocator if configure. Also add a few comments where the existing behavior seems to be lacking. -Signed-off-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Christoph Hellwig <hch at lst.de> --- arch/m68k/Kconfig | 2 ++ arch/m68k/kernel/dma.c | 64 ++++++++++++------------------------------ diff --git a/a/content_digest b/N2/content_digest index d7d1bc5..8e1d2d7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,13 @@ "ref\020181214082515.14835-1-hch@lst.de\0" "ref\020181214082515.14835-2-hch@lst.de\0" "ref\0CAMuHMdWOr0EsgFQF8tjJYLxKVXx+Jwn73N8SVKt8AQGLKQ8V-A@mail.gmail.com\0" - "From\0Christoph Hellwig <hch@lst.de>\0" - "Subject\0Re: [PATCH 1/2] dma-mapping: zero memory returned from dma_alloc_*\0" + "From\0hch@lst.de (Christoph Hellwig)\0" + "Subject\0[PATCH 1/2] dma-mapping: zero memory returned from dma_alloc_*\0" "Date\0Fri, 14 Dec 2018 12:47:19 +0100\0" - "To\0Geert Uytterhoeven <geert@linux-m68k.org>\0" - "Cc\0Christoph Hellwig <hch@lst.de>" - Linux IOMMU <iommu@lists.linux-foundation.org> - Michal Simek <monstr@monstr.eu> - ashutosh.dixit@intel.com - alpha <linux-alpha@vger.kernel.org> - arcml <linux-snps-arc@lists.infradead.org> - linux-c6x-dev@linux-c6x.org - linux-m68k <linux-m68k@lists.linux-m68k.org> - Openrisc <openrisc@lists.librecores.org> - Parisc List <linux-parisc@vger.kernel.org> - linux-s390 <linux-s390@vger.kernel.org> - sparclinux <sparclinux@vger.kernel.org> - linux-xtensa@linux-xtensa.org - " Linux Kernel Mailing List <linux-kernel@vger.kernel.org>\0" + "To\0linux-snps-arc@lists.infradead.org\0" "\00:1\0" "b\0" - "On Fri, Dec 14, 2018 at 10:54:32AM +0100, Geert Uytterhoeven wrote:\n" + "On Fri, Dec 14, 2018@10:54:32AM +0100, Geert Uytterhoeven wrote:\n" "> > - page = alloc_pages(flag, order);\n" "> > + page = alloc_pages(flag | GFP_ZERO, order);\n" "> > if (!page)\n" @@ -50,7 +36,7 @@ "Compile tested only patch below:\n" "\n" "--\n" - "From ade86dc75b9850daf9111ebf9ce15825a6144f2d Mon Sep 17 00:00:00 2001\n" + ">From ade86dc75b9850daf9111ebf9ce15825a6144f2d Mon Sep 17 00:00:00 2001\n" "From: Christoph Hellwig <hch@lst.de>\n" "Date: Fri, 14 Dec 2018 12:41:45 +0100\n" "Subject: m68k: use the generic dma coherent remap allocator\n" @@ -59,7 +45,7 @@ "potential use of the CMA allocator if configure. Also add a few\n" "comments where the existing behavior seems to be lacking.\n" "\n" - "Signed-off-by: Christoph Hellwig <hch@lst.de>\n" + "Signed-off-by: Christoph Hellwig <hch at lst.de>\n" "---\n" " arch/m68k/Kconfig | 2 ++\n" " arch/m68k/kernel/dma.c | 64 ++++++++++++------------------------------\n" @@ -165,4 +151,4 @@ "-- \n" 2.19.2 -146219fa4f56934b1bd551749669ff6735df96554d7277414dd58d32e1e7acb7 +553e6da43754a55b3699f2de3fb4b9d673c0bf8463e957fdba0ce1c035012d67
diff --git a/a/1.txt b/N3/1.txt index bcf9946..9967680 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -125,7 +125,7 @@ index dafe99d08a6a..16da5d96e228 100644 - pr_debug("dma_free_coherent: %p, %x\n", addr, handle); - vfree(addr); + /* -+ * XXX: this doesn't seem to handle the sun3 MMU at all. ++ * XXX: this doesn't seem to handle the sun3 MMU@all. + */ + if (CPU_IS_040_OR_060) { + pgprot_val(prot) &= ~_PAGE_CACHE040; diff --git a/a/content_digest b/N3/content_digest index d7d1bc5..1fb03a1 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,23 +2,9 @@ "ref\020181214082515.14835-2-hch@lst.de\0" "ref\0CAMuHMdWOr0EsgFQF8tjJYLxKVXx+Jwn73N8SVKt8AQGLKQ8V-A@mail.gmail.com\0" "From\0Christoph Hellwig <hch@lst.de>\0" - "Subject\0Re: [PATCH 1/2] dma-mapping: zero memory returned from dma_alloc_*\0" + "Subject\0[OpenRISC] [PATCH 1/2] dma-mapping: zero memory returned from dma_alloc_*\0" "Date\0Fri, 14 Dec 2018 12:47:19 +0100\0" - "To\0Geert Uytterhoeven <geert@linux-m68k.org>\0" - "Cc\0Christoph Hellwig <hch@lst.de>" - Linux IOMMU <iommu@lists.linux-foundation.org> - Michal Simek <monstr@monstr.eu> - ashutosh.dixit@intel.com - alpha <linux-alpha@vger.kernel.org> - arcml <linux-snps-arc@lists.infradead.org> - linux-c6x-dev@linux-c6x.org - linux-m68k <linux-m68k@lists.linux-m68k.org> - Openrisc <openrisc@lists.librecores.org> - Parisc List <linux-parisc@vger.kernel.org> - linux-s390 <linux-s390@vger.kernel.org> - sparclinux <sparclinux@vger.kernel.org> - linux-xtensa@linux-xtensa.org - " Linux Kernel Mailing List <linux-kernel@vger.kernel.org>\0" + "To\0openrisc@lists.librecores.org\0" "\00:1\0" "b\0" "On Fri, Dec 14, 2018 at 10:54:32AM +0100, Geert Uytterhoeven wrote:\n" @@ -148,7 +134,7 @@ "-\tpr_debug(\"dma_free_coherent: %p, %x\\n\", addr, handle);\n" "-\tvfree(addr);\n" "+\t/*\n" - "+\t * XXX: this doesn't seem to handle the sun3 MMU at all.\n" + "+\t * XXX: this doesn't seem to handle the sun3 MMU@all.\n" "+\t */\n" "+\tif (CPU_IS_040_OR_060) {\n" "+\t\tpgprot_val(prot) &= ~_PAGE_CACHE040;\n" @@ -165,4 +151,4 @@ "-- \n" 2.19.2 -146219fa4f56934b1bd551749669ff6735df96554d7277414dd58d32e1e7acb7 +1ddbfbc8a476db14553fa7fb832663f6388dde2d0aec3c0342be7489d5fee931
diff --git a/a/content_digest b/N4/content_digest index d7d1bc5..9cdf4e8 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -3,7 +3,7 @@ "ref\0CAMuHMdWOr0EsgFQF8tjJYLxKVXx+Jwn73N8SVKt8AQGLKQ8V-A@mail.gmail.com\0" "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0Re: [PATCH 1/2] dma-mapping: zero memory returned from dma_alloc_*\0" - "Date\0Fri, 14 Dec 2018 12:47:19 +0100\0" + "Date\0Fri, 14 Dec 2018 11:47:19 +0000\0" "To\0Geert Uytterhoeven <geert@linux-m68k.org>\0" "Cc\0Christoph Hellwig <hch@lst.de>" Linux IOMMU <iommu@lists.linux-foundation.org> @@ -165,4 +165,4 @@ "-- \n" 2.19.2 -146219fa4f56934b1bd551749669ff6735df96554d7277414dd58d32e1e7acb7 +231550ace3ab6d4a73a961aeedca8bad9bd23b3c975c4f3123d68d86a3ade5bb
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.