diff for duplicates of <20180423170419.20330-12-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index 3c64fa9..065c19a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -242,7 +242,7 @@ index 07b031f99eb1..7a5fec800992 100644
select X86_DMA_REMAP
select SWIOTLB
@@ -916,17 +918,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
- Calgary anyway, pass 'iommu=calgary' on the kernel command line.
+ Calgary anyway, pass 'iommuÊlgary' on the kernel command line.
If unsure, say Y.
-# need this always selected by IOMMU for the VIA workaround
diff --git a/a/content_digest b/N1/content_digest
index 6905a3e..8344e6f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,20 +8,10 @@
"Subject\0[PATCH 11/12] swiotlb: move the SWIOTLB config symbol to lib/Kconfig\0"
]
[
- "Date\0Mon, 23 Apr 2018 19:04:18 +0200\0"
+ "Date\0Mon, 23 Apr 2018 17:04:18 +0000\0"
]
[
- "To\0Konrad Rzeszutek Wilk <konrad.wilk\@oracle.com>",
- " iommu\@lists.linux-foundation.org\0"
-]
-[
- "Cc\0x86\@kernel.org",
- " linux-block\@vger.kernel.org",
- " linux-pci\@vger.kernel.org",
- " linux-mm\@kvack.org",
- " linux-mips\@linux-mips.org",
- " sparclinux\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -274,7 +264,7 @@
" \tselect X86_DMA_REMAP\n",
" \tselect SWIOTLB\n",
"\@\@ -916,17 +918,6 \@\@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT\n",
- " \t Calgary anyway, pass 'iommu=calgary' on the kernel command line.\n",
+ " \t Calgary anyway, pass 'iommu\303\212lgary' on the kernel command line.\n",
" \t If unsure, say Y.\n",
" \n",
"-# need this always selected by IOMMU for the VIA workaround\n",
@@ -329,4 +319,4 @@
"2.17.0"
]
-b326448adb52fa741fa36bb967a92143bfa93ebbcfa0b734cfef4480509661f7
+0de3e58e2af8cd92fc4ae1a3684372826a908586d58b169fe8b4254c02477da4
diff --git a/a/1.txt b/N2/1.txt
index 3c64fa9..ea77de6 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -4,7 +4,7 @@ indicate the architecture supports swiotlb at all, so that we can still
make the usage optional for a few architectures that want this feature
to be user selectable.
-Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
---
arch/arm/Kconfig | 4 +---
arch/arm64/Kconfig | 5 ++---
diff --git a/a/content_digest b/N2/content_digest
index 6905a3e..4d36cc9 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,10 @@
"ref\00020180423170419.20330-1-hch\@lst.de\0"
]
[
- "From\0Christoph Hellwig <hch\@lst.de>\0"
+ "ref\00020180423170419.20330-1-hch-jcswGhMUV9g\@public.gmane.org\0"
+]
+[
+ "From\0Christoph Hellwig <hch-jcswGhMUV9g\@public.gmane.org>\0"
]
[
"Subject\0[PATCH 11/12] swiotlb: move the SWIOTLB config symbol to lib/Kconfig\0"
@@ -11,17 +14,17 @@
"Date\0Mon, 23 Apr 2018 19:04:18 +0200\0"
]
[
- "To\0Konrad Rzeszutek Wilk <konrad.wilk\@oracle.com>",
- " iommu\@lists.linux-foundation.org\0"
+ "To\0Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA\@public.gmane.org>",
+ " iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA\@public.gmane.org\0"
]
[
- "Cc\0x86\@kernel.org",
- " linux-block\@vger.kernel.org",
- " linux-pci\@vger.kernel.org",
- " linux-mm\@kvack.org",
- " linux-mips\@linux-mips.org",
- " sparclinux\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "Cc\0linux-mips-6z/3iImG2C8G8FEW9MqTrA\@public.gmane.org",
+ " linux-pci-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " x86-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org",
+ " linux-block-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-mm-Bw31MaZKKs3YtjvyW6yDsg\@public.gmane.org",
+ " sparclinux-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org\0"
]
[
"\0000:1\0"
@@ -36,7 +39,7 @@
"make the usage optional for a few architectures that want this feature\n",
"to be user selectable.\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/Kconfig | 4 +---\n",
" arch/arm64/Kconfig | 5 ++---\n",
@@ -329,4 +332,4 @@
"2.17.0"
]
-b326448adb52fa741fa36bb967a92143bfa93ebbcfa0b734cfef4480509661f7
+260aa5b7eb3e0a8f38e54002b2ff044f40a7337212cb5b04f42b570296272548
diff --git a/a/content_digest b/N3/content_digest
index 6905a3e..025e2db 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -2,7 +2,7 @@
"ref\00020180423170419.20330-1-hch\@lst.de\0"
]
[
- "From\0Christoph Hellwig <hch\@lst.de>\0"
+ "From\0hch\@lst.de (Christoph Hellwig)\0"
]
[
"Subject\0[PATCH 11/12] swiotlb: move the SWIOTLB config symbol to lib/Kconfig\0"
@@ -11,17 +11,7 @@
"Date\0Mon, 23 Apr 2018 19:04:18 +0200\0"
]
[
- "To\0Konrad Rzeszutek Wilk <konrad.wilk\@oracle.com>",
- " iommu\@lists.linux-foundation.org\0"
-]
-[
- "Cc\0x86\@kernel.org",
- " linux-block\@vger.kernel.org",
- " linux-pci\@vger.kernel.org",
- " linux-mm\@kvack.org",
- " linux-mips\@linux-mips.org",
- " sparclinux\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -329,4 +319,4 @@
"2.17.0"
]
-b326448adb52fa741fa36bb967a92143bfa93ebbcfa0b734cfef4480509661f7
+eba6bad744d9b1ee3b8cfeb520784cea6db48458dedb44a581204b30cac1dc4e
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.