diff for duplicates of <20200819065555.1802761-11-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index ed39991..2e4f10a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -77,4 +77,10 @@ index fe40dbed04c1d6..d0b5a2ba2b1a8a 100644
.mmap = dma_common_mmap,
.get_sgtable = dma_common_get_sgtable,
--
-2.28.0
\ No newline at end of file
+2.28.0
+
+
+_______________________________________________
+Linux-nvme mailing list
+Linux-nvme@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-nvme
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index e671c50..866bdf6 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -25,20 +25,20 @@
]
[
"Cc\0Tom Lendacky <thomas.lendacky\@amd.com>",
- " linux-doc\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-media\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
+ " alsa-devel\@alsa-project.org",
+ " linux-samsung-soc\@vger.kernel.org",
" linux-ia64\@vger.kernel.org",
- " linux-mips\@vger.kernel.org",
+ " linux-scsi\@vger.kernel.org",
" linux-parisc\@vger.kernel.org",
- " linux-samsung-soc\@vger.kernel.org",
+ " linux-doc\@vger.kernel.org",
" nouveau\@lists.freedesktop.org",
- " netdev\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
" linux-nvme\@lists.infradead.org",
- " linux-scsi\@vger.kernel.org",
+ " linux-mips\@vger.kernel.org",
" linux-mm\@kvack.org",
- " alsa-devel\@alsa-project.org\0"
+ " netdev\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-media\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -126,7 +126,13 @@
" \t.mmap\t\t\t= dma_common_mmap,\n",
" \t.get_sgtable\t\t= dma_common_get_sgtable,\n",
"-- \n",
- "2.28.0"
+ "2.28.0\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "Linux-nvme mailing list\n",
+ "Linux-nvme\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-nvme"
]
-3f23b2bcdda2e6868cac522405a78899324c0dad2208988718c3ac0b3568fc84
+b5abe2d443d02f878f1ca9617d53a90a96dc7313195936e84f31f71e83935b85
diff --git a/a/content_digest b/N2/content_digest
index e671c50..cc7b9f0 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -25,20 +25,20 @@
]
[
"Cc\0Tom Lendacky <thomas.lendacky\@amd.com>",
- " linux-doc\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-media\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
+ " alsa-devel\@alsa-project.org",
+ " linux-samsung-soc\@vger.kernel.org",
" linux-ia64\@vger.kernel.org",
- " linux-mips\@vger.kernel.org",
+ " linux-scsi\@vger.kernel.org",
" linux-parisc\@vger.kernel.org",
- " linux-samsung-soc\@vger.kernel.org",
+ " linux-doc\@vger.kernel.org",
" nouveau\@lists.freedesktop.org",
- " netdev\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
" linux-nvme\@lists.infradead.org",
- " linux-scsi\@vger.kernel.org",
+ " linux-mips\@vger.kernel.org",
" linux-mm\@kvack.org",
- " alsa-devel\@alsa-project.org\0"
+ " netdev\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-media\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -129,4 +129,4 @@
"2.28.0"
]
-3f23b2bcdda2e6868cac522405a78899324c0dad2208988718c3ac0b3568fc84
+f985d2a3e669cf41cc8f885818fa407c1f320a0b5f0c576d77db93db582d5612
diff --git a/a/1.txt b/N3/1.txt
index ed39991..a39c5f0 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -3,7 +3,7 @@ should not use the dma-direct code that takes physical address limits
into account. This survived through the great MIPS DMA ops cleanup mostly
because I was lazy, but now it is time to fully split the implementations.
-Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
---
arch/mips/jazz/jazzdma.c | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/a/content_digest b/N3/content_digest
index e671c50..3e29690 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -2,7 +2,10 @@
"ref\00020200819065555.1802761-1-hch\@lst.de\0"
]
[
- "From\0Christoph Hellwig <hch\@lst.de>\0"
+ "ref\00020200819065555.1802761-1-hch-jcswGhMUV9g\@public.gmane.org\0"
+]
+[
+ "From\0Christoph Hellwig <hch-jcswGhMUV9g\@public.gmane.org>\0"
]
[
"Subject\0[PATCH 10/28] MIPS/jazzdma: decouple from dma-direct\0"
@@ -11,34 +14,34 @@
"Date\0Wed, 19 Aug 2020 08:55:37 +0200\0"
]
[
- "To\0Mauro Carvalho Chehab <mchehab\@kernel.org>",
- " Thomas Bogendoerfer <tsbogend\@alpha.franken.de>",
- " James E.J. Bottomley <James.Bottomley\@hansenpartnership.com>",
- " Joonyoung Shim <jy0922.shim\@samsung.com>",
- " Seung-Woo Kim <sw0312.kim\@samsung.com>",
- " Kyungmin Park <kyungmin.park\@samsung.com>",
- " Ben Skeggs <bskeggs\@redhat.com>",
- " Pawel Osciak <pawel\@osciak.com>",
- " Marek Szyprowski <m.szyprowski\@samsung.com>",
- " Matt Porter <mporter\@kernel.crashing.org>",
- " iommu\@lists.linux-foundation.org\0"
+ "To\0Mauro Carvalho Chehab <mchehab-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
+ " Thomas Bogendoerfer <tsbogend-I1c7kopa9pxLokYuJOExCg\@public.gmane.org>",
+ " James E.J. Bottomley <James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk\@public.gmane.org>",
+ " Joonyoung Shim <jy0922.shim-Sze3O3UU22JBDgjK7y7TUQ\@public.gmane.org>",
+ " Seung-Woo Kim <sw0312.kim-Sze3O3UU22JBDgjK7y7TUQ\@public.gmane.org>",
+ " Kyungmin Park <kyungmin.park-Sze3O3UU22JBDgjK7y7TUQ\@public.gmane.org>",
+ " Ben Skeggs <bskeggs-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>",
+ " Pawel Osciak <pawel-FA/gS7QP4orQT0dZR+AlfA\@public.gmane.org>",
+ " Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ\@public.gmane.org>",
+ " Matt Porter <mporter-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r\@public.gmane.org>",
+ " iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA\@public.gmane.org\0"
]
[
- "Cc\0Tom Lendacky <thomas.lendacky\@amd.com>",
- " linux-doc\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-media\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-ia64\@vger.kernel.org",
- " linux-mips\@vger.kernel.org",
- " linux-parisc\@vger.kernel.org",
- " linux-samsung-soc\@vger.kernel.org",
- " nouveau\@lists.freedesktop.org",
- " netdev\@vger.kernel.org",
- " linux-nvme\@lists.infradead.org",
- " linux-scsi\@vger.kernel.org",
- " linux-mm\@kvack.org",
- " alsa-devel\@alsa-project.org\0"
+ "Cc\0Tom Lendacky <thomas.lendacky-5C7GfCeVMHo\@public.gmane.org>",
+ " alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw\@public.gmane.org",
+ " linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-ia64-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-scsi-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-parisc-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-doc-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW\@public.gmane.org",
+ " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-nvme-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+ " linux-mips-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-mm-Bw31MaZKKs3YtjvyW6yDsg\@public.gmane.org",
+ " netdev-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+ " linux-media-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\0"
]
[
"\0000:1\0"
@@ -52,7 +55,7 @@
"into account. This survived through the great MIPS DMA ops cleanup mostly\n",
"because I was lazy, but now it is time to fully split the implementations.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g\@public.gmane.org>\n",
"---\n",
" arch/mips/jazz/jazzdma.c | 32 +++++++++++++++++++++-----------\n",
" 1 file changed, 21 insertions(+), 11 deletions(-)\n",
@@ -129,4 +132,4 @@
"2.28.0"
]
-3f23b2bcdda2e6868cac522405a78899324c0dad2208988718c3ac0b3568fc84
+204c8acfa6fb1dfb139b1d493f2cb3cfdb764d0bee704d1395821e27c893fcae
diff --git a/a/1.txt b/N4/1.txt
index ed39991..ca2f6b9 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -77,4 +77,9 @@ index fe40dbed04c1d6..d0b5a2ba2b1a8a 100644
.mmap = dma_common_mmap,
.get_sgtable = dma_common_get_sgtable,
--
-2.28.0
\ No newline at end of file
+2.28.0
+
+_______________________________________________
+iommu mailing list
+iommu@lists.linux-foundation.org
+https://lists.linuxfoundation.org/mailman/listinfo/iommu
\ No newline at end of file
diff --git a/a/content_digest b/N4/content_digest
index e671c50..55c9336 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -25,20 +25,20 @@
]
[
"Cc\0Tom Lendacky <thomas.lendacky\@amd.com>",
- " linux-doc\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-media\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
+ " alsa-devel\@alsa-project.org",
+ " linux-samsung-soc\@vger.kernel.org",
" linux-ia64\@vger.kernel.org",
- " linux-mips\@vger.kernel.org",
+ " linux-scsi\@vger.kernel.org",
" linux-parisc\@vger.kernel.org",
- " linux-samsung-soc\@vger.kernel.org",
+ " linux-doc\@vger.kernel.org",
" nouveau\@lists.freedesktop.org",
- " netdev\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
" linux-nvme\@lists.infradead.org",
- " linux-scsi\@vger.kernel.org",
+ " linux-mips\@vger.kernel.org",
" linux-mm\@kvack.org",
- " alsa-devel\@alsa-project.org\0"
+ " netdev\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-media\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -126,7 +126,12 @@
" \t.mmap\t\t\t= dma_common_mmap,\n",
" \t.get_sgtable\t\t= dma_common_get_sgtable,\n",
"-- \n",
- "2.28.0"
+ "2.28.0\n",
+ "\n",
+ "_______________________________________________\n",
+ "iommu mailing list\n",
+ "iommu\@lists.linux-foundation.org\n",
+ "https://lists.linuxfoundation.org/mailman/listinfo/iommu"
]
-3f23b2bcdda2e6868cac522405a78899324c0dad2208988718c3ac0b3568fc84
+8c719ef93a1a1b2e0c2c9ced33a2aa81da0161cccc9800634783fa1ec0462335
diff --git a/a/1.txt b/N5/1.txt
index ed39991..535a2e9 100644
--- a/a/1.txt
+++ b/N5/1.txt
@@ -77,4 +77,10 @@ index fe40dbed04c1d6..d0b5a2ba2b1a8a 100644
.mmap = dma_common_mmap,
.get_sgtable = dma_common_get_sgtable,
--
-2.28.0
\ No newline at end of file
+2.28.0
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
\ No newline at end of file
diff --git a/a/content_digest b/N5/content_digest
index e671c50..3643f64 100644
--- a/a/content_digest
+++ b/N5/content_digest
@@ -25,20 +25,20 @@
]
[
"Cc\0Tom Lendacky <thomas.lendacky\@amd.com>",
- " linux-doc\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-media\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
+ " alsa-devel\@alsa-project.org",
+ " linux-samsung-soc\@vger.kernel.org",
" linux-ia64\@vger.kernel.org",
- " linux-mips\@vger.kernel.org",
+ " linux-scsi\@vger.kernel.org",
" linux-parisc\@vger.kernel.org",
- " linux-samsung-soc\@vger.kernel.org",
+ " linux-doc\@vger.kernel.org",
" nouveau\@lists.freedesktop.org",
- " netdev\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
" linux-nvme\@lists.infradead.org",
- " linux-scsi\@vger.kernel.org",
+ " linux-mips\@vger.kernel.org",
" linux-mm\@kvack.org",
- " alsa-devel\@alsa-project.org\0"
+ " netdev\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " linux-media\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -126,7 +126,13 @@
" \t.mmap\t\t\t= dma_common_mmap,\n",
" \t.get_sgtable\t\t= dma_common_get_sgtable,\n",
"-- \n",
- "2.28.0"
+ "2.28.0\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "linux-arm-kernel mailing list\n",
+ "linux-arm-kernel\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-arm-kernel"
]
-3f23b2bcdda2e6868cac522405a78899324c0dad2208988718c3ac0b3568fc84
+b76309afcc979e021a04b6cdcd354e350567830ed8a9885af81e9fb76ca8ff96
diff --git a/a/1.txt b/N6/1.txt
index ed39991..e6d9562 100644
--- a/a/1.txt
+++ b/N6/1.txt
@@ -34,7 +34,7 @@ index fe40dbed04c1d6..d0b5a2ba2b1a8a 100644
+ gfp |= __GFP_NOWARN;
- *dma_handle = vdma_alloc(virt_to_phys(ret), size);
-- if (*dma_handle == DMA_MAPPING_ERROR) {
+- if (*dma_handle = DMA_MAPPING_ERROR) {
- dma_direct_free_pages(dev, size, ret, *dma_handle, attrs);
+ size = PAGE_ALIGN(size);
+ page = alloc_pages(gfp, get_order(size));
@@ -43,7 +43,7 @@ index fe40dbed04c1d6..d0b5a2ba2b1a8a 100644
- }
+ ret = page_address(page);
+ *dma_handle = vdma_alloc(virt_to_phys(ret), size);
-+ if (*dma_handle == DMA_MAPPING_ERROR)
++ if (*dma_handle = DMA_MAPPING_ERROR)
+ goto out_free_pages;
+
+ if (attrs & DMA_ATTR_NON_CONSISTENT)
diff --git a/a/content_digest b/N6/content_digest
index e671c50..8daa9e5 100644
--- a/a/content_digest
+++ b/N6/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 10/28] MIPS/jazzdma: decouple from dma-direct\0"
]
[
- "Date\0Wed, 19 Aug 2020 08:55:37 +0200\0"
+ "Date\0Wed, 19 Aug 2020 06:55:37 +0000\0"
]
[
"To\0Mauro Carvalho Chehab <mchehab\@kernel.org>",
@@ -83,7 +83,7 @@
"+\t\tgfp |= __GFP_NOWARN;\n",
" \n",
"-\t*dma_handle = vdma_alloc(virt_to_phys(ret), size);\n",
- "-\tif (*dma_handle == DMA_MAPPING_ERROR) {\n",
+ "-\tif (*dma_handle = DMA_MAPPING_ERROR) {\n",
"-\t\tdma_direct_free_pages(dev, size, ret, *dma_handle, attrs);\n",
"+\tsize = PAGE_ALIGN(size);\n",
"+\tpage = alloc_pages(gfp, get_order(size));\n",
@@ -92,7 +92,7 @@
"-\t}\n",
"+\tret = page_address(page);\n",
"+\t*dma_handle = vdma_alloc(virt_to_phys(ret), size);\n",
- "+\tif (*dma_handle == DMA_MAPPING_ERROR)\n",
+ "+\tif (*dma_handle = DMA_MAPPING_ERROR)\n",
"+\t\tgoto out_free_pages;\n",
"+\n",
"+\tif (attrs & DMA_ATTR_NON_CONSISTENT)\n",
@@ -129,4 +129,4 @@
"2.28.0"
]
-3f23b2bcdda2e6868cac522405a78899324c0dad2208988718c3ac0b3568fc84
+8a64098987ecda46e4e023605968cb4916f2a2e2ad3533512d04d51648157d99
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.