diff for duplicates of <20200819065555.1802761-17-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index 8745979..bf27e85 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -282,4 +282,10 @@ index c19379fabd200e..4ea72d145cd27d 100644
swiotlb_tbl_unmap_single(dev, swiotlb_addr, size, size, dir,
attrs | DMA_ATTR_SKIP_CPU_SYNC);
--
-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 4e9ec2a..6aa5796 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"
@@ -331,7 +331,13 @@
" \t\tswiotlb_tbl_unmap_single(dev, swiotlb_addr, size, size, dir,\n",
" \t\t\tattrs | DMA_ATTR_SKIP_CPU_SYNC);\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"
]
-6cc450668074a15588a5d13543395ad78c80f39de196b759355171297cd550dd
+33104c7b83c19ba989e2de77464fa6f88fe1bd56fdd7762981d99bf1185dfc37
diff --git a/a/content_digest b/N2/content_digest
index 4e9ec2a..b726b2a 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"
@@ -334,4 +334,4 @@
"2.28.0"
]
-6cc450668074a15588a5d13543395ad78c80f39de196b759355171297cd550dd
+3a32301b208bedf3ba664fa9b0bb590c458838b10d572b35188d1ddd93b3db7c
diff --git a/a/1.txt b/N3/1.txt
index 8745979..ad19a4d 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -3,7 +3,7 @@ to improve the situation by renaming __phys_to_dma to
phys_to_dma_unencryped, and not forcing architectures that want to
override phys_to_dma to actually provide __phys_to_dma.
-Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
---
arch/arm/include/asm/dma-direct.h | 2 +-
arch/mips/bmips/dma.c | 2 +-
diff --git a/a/content_digest b/N3/content_digest
index 4e9ec2a..d1199a4 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 16/28] dma-direct: rename and cleanup __phys_to_dma\0"
@@ -11,34 +14,34 @@
"Date\0Wed, 19 Aug 2020 08:55:43 +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 @@
"phys_to_dma_unencryped, and not forcing architectures that want to\n",
"override phys_to_dma to actually provide __phys_to_dma.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g\@public.gmane.org>\n",
"---\n",
" arch/arm/include/asm/dma-direct.h | 2 +-\n",
" arch/mips/bmips/dma.c | 2 +-\n",
@@ -334,4 +337,4 @@
"2.28.0"
]
-6cc450668074a15588a5d13543395ad78c80f39de196b759355171297cd550dd
+124f590a969c1e726dfc4208aa60ffb2007df72ba5cd0ad9e8eb2aabad4c11b1
diff --git a/a/1.txt b/N4/1.txt
index 8745979..1f7df35 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -282,4 +282,9 @@ index c19379fabd200e..4ea72d145cd27d 100644
swiotlb_tbl_unmap_single(dev, swiotlb_addr, size, size, dir,
attrs | DMA_ATTR_SKIP_CPU_SYNC);
--
-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 4e9ec2a..f07f5f3 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"
@@ -331,7 +331,12 @@
" \t\tswiotlb_tbl_unmap_single(dev, swiotlb_addr, size, size, dir,\n",
" \t\t\tattrs | DMA_ATTR_SKIP_CPU_SYNC);\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"
]
-6cc450668074a15588a5d13543395ad78c80f39de196b759355171297cd550dd
+b0b1b60b733c53a9c27a83b6c8728c27ff8f328e414cf7d3e0c559e192288a1b
diff --git a/a/1.txt b/N5/1.txt
index 8745979..b700508 100644
--- a/a/1.txt
+++ b/N5/1.txt
@@ -282,4 +282,10 @@ index c19379fabd200e..4ea72d145cd27d 100644
swiotlb_tbl_unmap_single(dev, swiotlb_addr, size, size, dir,
attrs | DMA_ATTR_SKIP_CPU_SYNC);
--
-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 4e9ec2a..f86dc5b 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"
@@ -331,7 +331,13 @@
" \t\tswiotlb_tbl_unmap_single(dev, swiotlb_addr, size, size, dir,\n",
" \t\t\tattrs | DMA_ATTR_SKIP_CPU_SYNC);\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"
]
-6cc450668074a15588a5d13543395ad78c80f39de196b759355171297cd550dd
+21210a7fc9cc27a34ded2d59f2add45b35397b168c98115c3a7ced02a7994877
diff --git a/a/1.txt b/N6/1.txt
index 8745979..924ffde 100644
--- a/a/1.txt
+++ b/N6/1.txt
@@ -176,7 +176,7 @@ index e9864e52b0e96a..99aa80456b7145 100644
- __phys_to_dma(dev, io_tlb_start),
+ phys_to_dma_unencrypted(dev, io_tlb_start),
paddr, size, aligned_size, dir, attrs);
- if (tlb_addr == DMA_MAPPING_ERROR) {
+ if (tlb_addr = DMA_MAPPING_ERROR) {
goto swiotlb_error;
diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
index 811582a39e291f..3797ecccc15466 100644
@@ -272,7 +272,7 @@ index c19379fabd200e..4ea72d145cd27d 100644
- __phys_to_dma(dev, io_tlb_start),
+ phys_to_dma_unencrypted(dev, io_tlb_start),
paddr, size, size, dir, attrs);
- if (swiotlb_addr == (phys_addr_t)DMA_MAPPING_ERROR)
+ if (swiotlb_addr = (phys_addr_t)DMA_MAPPING_ERROR)
return DMA_MAPPING_ERROR;
/* Ensure that the address returned is DMA'ble */
diff --git a/a/content_digest b/N6/content_digest
index 4e9ec2a..cc23552 100644
--- a/a/content_digest
+++ b/N6/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 16/28] dma-direct: rename and cleanup __phys_to_dma\0"
]
[
- "Date\0Wed, 19 Aug 2020 08:55:43 +0200\0"
+ "Date\0Wed, 19 Aug 2020 06:55:43 +0000\0"
]
[
"To\0Mauro Carvalho Chehab <mchehab\@kernel.org>",
@@ -225,7 +225,7 @@
"-\t\t\t\t__phys_to_dma(dev, io_tlb_start),\n",
"+\t\t\t\tphys_to_dma_unencrypted(dev, io_tlb_start),\n",
" \t\t\t\tpaddr, size, aligned_size, dir, attrs);\n",
- " \t\tif (tlb_addr == DMA_MAPPING_ERROR) {\n",
+ " \t\tif (tlb_addr = DMA_MAPPING_ERROR) {\n",
" \t\t\tgoto swiotlb_error;\n",
"diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h\n",
"index 811582a39e291f..3797ecccc15466 100644\n",
@@ -321,7 +321,7 @@
"-\t\t\t__phys_to_dma(dev, io_tlb_start),\n",
"+\t\t\tphys_to_dma_unencrypted(dev, io_tlb_start),\n",
" \t\t\tpaddr, size, size, dir, attrs);\n",
- " \tif (swiotlb_addr == (phys_addr_t)DMA_MAPPING_ERROR)\n",
+ " \tif (swiotlb_addr = (phys_addr_t)DMA_MAPPING_ERROR)\n",
" \t\treturn DMA_MAPPING_ERROR;\n",
" \n",
" \t/* Ensure that the address returned is DMA'ble */\n",
@@ -334,4 +334,4 @@
"2.28.0"
]
-6cc450668074a15588a5d13543395ad78c80f39de196b759355171297cd550dd
+e9c37a47816851fbb32f5ff062608f7f14d6a1fbe812c180d3052bb59edb8f2b
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.