diff for duplicates of <1464129345-18985-6-git-send-email-ddaney.cavm@gmail.com>
diff --git a/a/content_digest b/N1/content_digest
index 6e6898a..88604a8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -35,8 +35,8 @@
" devel\@acpica.org\0"
]
[
- "Cc\0Robert Richter <rrichter\@cavium.com>",
- " linux-kernel\@vger.kernel.org",
+ "Cc\0linux-kernel\@vger.kernel.org",
+ " Robert Richter <rrichter\@cavium.com>",
" David Daney <david.daney\@cavium.com>\0"
]
[
@@ -145,4 +145,4 @@
"1.7.11.7"
]
-d97052ef7e8a38c8cbc98aa625ba5e099a4bf0565b41424d1acf1adc0a0384e4
+b2e65439683973da57e4a6c23d4e27cbf9d6f93e0f96718391f7517f118c9eeb
diff --git a/a/1.txt b/N2/1.txt
index 559e115..65a35f0 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -26,7 +26,7 @@ index 90b6ed9..f242a11 100644
-/*
- * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for
- * I/O localities since SRAT does not list them. I/O localities are
-- * not supported at this point.
+- * not supported@this point.
- */
-void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
-{
diff --git a/a/content_digest b/N2/content_digest
index 6e6898a..612985a 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001464129345-18985-1-git-send-email-ddaney.cavm\@gmail.com\0"
]
[
- "From\0David Daney <ddaney.cavm\@gmail.com>\0"
+ "From\0ddaney.cavm\@gmail.com (David Daney)\0"
]
[
"Subject\0[PATCH v7 05/15] acpi, numa: move acpi_numa_slit_init() to drivers/acpi/numa.c\0"
@@ -11,33 +11,7 @@
"Date\0Tue, 24 May 2016 15:35:35 -0700\0"
]
[
- "To\0Will Deacon <will.deacon\@arm.com>",
- " linux-arm-kernel\@lists.infradead.org",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Tony Luck <tony.luck\@intel.com>",
- " Fenghua Yu <fenghua.yu\@intel.com>",
- " Thomas Gleixner <tglx\@linutronix.de>",
- " Ingo Molnar <mingo\@redhat.com>",
- " H. Peter Anvin <hpa\@zytor.com>",
- " x86\@kernel.org",
- " Rafael J. Wysocki <rjw\@rjwysocki.net>",
- " Len Brown <lenb\@kernel.org>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Frank Rowand <frowand.list\@gmail.com>",
- " Grant Likely <grant.likely\@linaro.org>",
- " Robert Moore <robert.moore\@intel.com>",
- " Lv Zheng <lv.zheng\@intel.com>",
- " Hanjun Guo <hanjun.guo\@linaro.org>",
- " Marc Zyngier <Marc.Zyngier\@arm.com>",
- " linux-ia64\@vger.kernel.org",
- " linux-acpi\@vger.kernel.org",
- " devel\@acpica.org\0"
-]
-[
- "Cc\0Robert Richter <rrichter\@cavium.com>",
- " linux-kernel\@vger.kernel.org",
- " David Daney <david.daney\@cavium.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -74,7 +48,7 @@
"-/*\n",
"- * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for\n",
"- * I/O localities since SRAT does not list them. I/O localities are\n",
- "- * not supported at this point.\n",
+ "- * not supported\@this point.\n",
"- */\n",
"-void __init acpi_numa_slit_init(struct acpi_table_slit *slit)\n",
"-{\n",
@@ -145,4 +119,4 @@
"1.7.11.7"
]
-d97052ef7e8a38c8cbc98aa625ba5e099a4bf0565b41424d1acf1adc0a0384e4
+0f30b38cc007db34fde616eb86285a750f0ece023966f38f57804b218f6d776b
diff --git a/a/1.txt b/N3/1.txt
index 559e115..92c45d8 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -35,13 +35,13 @@ index 90b6ed9..f242a11 100644
- for (i = 0; i < slit->locality_count; i++) {
- const int from_node = pxm_to_node(i);
-
-- if (from_node == NUMA_NO_NODE)
+- if (from_node = NUMA_NO_NODE)
- continue;
-
- for (j = 0; j < slit->locality_count; j++) {
- const int to_node = pxm_to_node(j);
-
-- if (to_node == NUMA_NO_NODE)
+- if (to_node = NUMA_NO_NODE)
- continue;
-
- numa_set_distance(from_node, to_node,
@@ -74,13 +74,13 @@ index fb2c0d6..7e0649d 100644
+ for (i = 0; i < slit->locality_count; i++) {
+ const int from_node = pxm_to_node(i);
+
-+ if (from_node == NUMA_NO_NODE)
++ if (from_node = NUMA_NO_NODE)
+ continue;
+
+ for (j = 0; j < slit->locality_count; j++) {
+ const int to_node = pxm_to_node(j);
+
-+ if (to_node == NUMA_NO_NODE)
++ if (to_node = NUMA_NO_NODE)
+ continue;
+
+ numa_set_distance(from_node, to_node,
diff --git a/a/content_digest b/N3/content_digest
index 6e6898a..042fb83 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v7 05/15] acpi, numa: move acpi_numa_slit_init() to drivers/acpi/numa.c\0"
]
[
- "Date\0Tue, 24 May 2016 15:35:35 -0700\0"
+ "Date\0Tue, 24 May 2016 22:35:35 +0000\0"
]
[
"To\0Will Deacon <will.deacon\@arm.com>",
@@ -83,13 +83,13 @@
"-\tfor (i = 0; i < slit->locality_count; i++) {\n",
"-\t\tconst int from_node = pxm_to_node(i);\n",
"-\n",
- "-\t\tif (from_node == NUMA_NO_NODE)\n",
+ "-\t\tif (from_node = NUMA_NO_NODE)\n",
"-\t\t\tcontinue;\n",
"-\n",
"-\t\tfor (j = 0; j < slit->locality_count; j++) {\n",
"-\t\t\tconst int to_node = pxm_to_node(j);\n",
"-\n",
- "-\t\t\tif (to_node == NUMA_NO_NODE)\n",
+ "-\t\t\tif (to_node = NUMA_NO_NODE)\n",
"-\t\t\t\tcontinue;\n",
"-\n",
"-\t\t\tnuma_set_distance(from_node, to_node,\n",
@@ -122,13 +122,13 @@
"+\tfor (i = 0; i < slit->locality_count; i++) {\n",
"+\t\tconst int from_node = pxm_to_node(i);\n",
"+\n",
- "+\t\tif (from_node == NUMA_NO_NODE)\n",
+ "+\t\tif (from_node = NUMA_NO_NODE)\n",
"+\t\t\tcontinue;\n",
"+\n",
"+\t\tfor (j = 0; j < slit->locality_count; j++) {\n",
"+\t\t\tconst int to_node = pxm_to_node(j);\n",
"+\n",
- "+\t\t\tif (to_node == NUMA_NO_NODE)\n",
+ "+\t\t\tif (to_node = NUMA_NO_NODE)\n",
"+\t\t\t\tcontinue;\n",
"+\n",
"+\t\t\tnuma_set_distance(from_node, to_node,\n",
@@ -145,4 +145,4 @@
"1.7.11.7"
]
-d97052ef7e8a38c8cbc98aa625ba5e099a4bf0565b41424d1acf1adc0a0384e4
+f9cb923a12829f4c20fc76f388bc225c9a8c3cb6d2710cd0818f0044237332b2
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.