diff for duplicates of <20181029072535.31667-5-chris.packham@alliedtelesis.co.nz>
diff --git a/a/1.txt b/N1/1.txt
index 98fd33c..f9efdf7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -25,6 +25,4 @@ index 7d2d2a3c67d0..b70bee74750d 100644
+
*aux_val &= ~mask;
*aux_val |= val;
- *aux_mask &= ~mask;
---
-2.19.1
\ No newline at end of file
+ *aux_mask &= ~mask;
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index eb1a61f..5427220 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,11 +1,8 @@
-[
- "ref\00020181029072535.31667-1-chris.packham\@alliedtelesis.co.nz\0"
-]
[
"From\0Chris Packham <chris.packham\@alliedtelesis.co.nz>\0"
]
[
- "Subject\0[PATCH v5 4/8] ARM: l2x0: support parity-enable/disable on aurora\0"
+ "Subject\0[v5,4/8] ARM: l2x0: support parity-enable/disable on aurora\0"
]
[
"Date\0Mon, 29 Oct 2018 20:25:31 +1300\0"
@@ -56,9 +53,7 @@
"+\n",
" \t*aux_val &= ~mask;\n",
" \t*aux_val |= val;\n",
- " \t*aux_mask &= ~mask;\n",
- "-- \n",
- "2.19.1"
+ " \t*aux_mask &= ~mask;"
]
-550f3edac7222d99df6459654670a1118fa503a55f7ce12178ebe5ded41036a7
+9aaf733bc1846701143fc08629cb946081e77901c92d3637c5e0f735a275d17a
diff --git a/a/1.txt b/N2/1.txt
index 98fd33c..f68f245 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -2,7 +2,7 @@ The aurora cache on the Marvell Armada-XP SoC supports the same tag
parity features as the other l2x0 cache implementations.
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
-[jlu@pengutronix.de: use aurora specific define AURORA_ACR_PARITY_EN]
+[jlu at pengutronix.de: use aurora specific define AURORA_ACR_PARITY_EN]
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
arch/arm/mm/cache-l2x0.c | 7 +++++++
diff --git a/a/content_digest b/N2/content_digest
index eb1a61f..443f747 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\00020181029072535.31667-1-chris.packham\@alliedtelesis.co.nz\0"
]
[
- "From\0Chris Packham <chris.packham\@alliedtelesis.co.nz>\0"
+ "From\0chris.packham\@alliedtelesis.co.nz (Chris Packham)\0"
]
[
"Subject\0[PATCH v5 4/8] ARM: l2x0: support parity-enable/disable on aurora\0"
@@ -11,16 +11,7 @@
"Date\0Mon, 29 Oct 2018 20:25:31 +1300\0"
]
[
- "To\0linux\@armlinux.org.uk\0"
-]
-[
- "Cc\0u.kleine-koenig\@pengutronix.de",
- " jlu\@pengutronix.de",
- " bp\@alien8.de",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-edac\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Chris Packham <chris.packham\@alliedtelesis.co.nz>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -33,7 +24,7 @@
"parity features as the other l2x0 cache implementations.\n",
"\n",
"Signed-off-by: Chris Packham <chris.packham\@alliedtelesis.co.nz>\n",
- "[jlu\@pengutronix.de: use aurora specific define AURORA_ACR_PARITY_EN]\n",
+ "[jlu at pengutronix.de: use aurora specific define AURORA_ACR_PARITY_EN]\n",
"Signed-off-by: Jan Luebbe <jlu\@pengutronix.de>\n",
"---\n",
" arch/arm/mm/cache-l2x0.c | 7 +++++++\n",
@@ -61,4 +52,4 @@
"2.19.1"
]
-550f3edac7222d99df6459654670a1118fa503a55f7ce12178ebe5ded41036a7
+3a4575d400ea951e1fb0fccd4739f5bb36ce6cc8904d75a95e9c0b78b847eccb
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.