diff for duplicates of <6d45a6e4596f0b282048fc4b8db9e7f7a19a46e3.1427759009.git.joe@perches.com>
diff --git a/a/content_digest b/N1/content_digest
index b70599d..792541e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -17,12 +17,10 @@
" Paolo Bonzini <pbonzini\@redhat.com>\0"
]
[
- "Cc\0Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
- " Paul Mackerras <paulus\@samba.org>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " linuxppc-dev\@lists.ozlabs.org",
+ "Cc\0kvm\@vger.kernel.org",
" kvm-ppc\@vger.kernel.org",
- " kvm\@vger.kernel.org\0"
+ " Paul Mackerras <paulus\@samba.org>",
+ " linuxppc-dev\@lists.ozlabs.org\0"
]
[
"\0000:1\0"
@@ -111,4 +109,4 @@
"2.1.2"
]
-47a5b56d1dde8663228379eeccc96a888df63305e96b583af33cdcf12867ccd2
+86f61fad351822926b34616343a44f9308ff2ab9a3e572047c94558c04c4400f
diff --git a/a/1.txt b/N2/1.txt
index 3465d77..f25fa1c 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -66,7 +66,7 @@ index 2d8a101..121e26f 100644
--- a/arch/powerpc/sysdev/dcr.c
+++ b/arch/powerpc/sysdev/dcr.c
@@ -54,7 +54,7 @@ bool dcr_map_ok_generic(dcr_host_t host)
- else if (host.type == DCR_HOST_MMIO)
+ else if (host.type = DCR_HOST_MMIO)
return dcr_map_ok_mmio(host.host.mmio);
else
- return 0;
diff --git a/a/content_digest b/N2/content_digest
index b70599d..c480eeb 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 06/25] powerpc: Use bool function return values of true/false not 1/0\0"
]
[
- "Date\0Mon, 30 Mar 2015 16:46:04 -0700\0"
+ "Date\0Mon, 30 Mar 2015 23:46:04 +0000\0"
]
[
"To\0linux-kernel\@vger.kernel.org",
@@ -99,7 +99,7 @@
"--- a/arch/powerpc/sysdev/dcr.c\n",
"+++ b/arch/powerpc/sysdev/dcr.c\n",
"\@\@ -54,7 +54,7 \@\@ bool dcr_map_ok_generic(dcr_host_t host)\n",
- " \telse if (host.type == DCR_HOST_MMIO)\n",
+ " \telse if (host.type = DCR_HOST_MMIO)\n",
" \t\treturn dcr_map_ok_mmio(host.host.mmio);\n",
" \telse\n",
"-\t\treturn 0;\n",
@@ -111,4 +111,4 @@
"2.1.2"
]
-47a5b56d1dde8663228379eeccc96a888df63305e96b583af33cdcf12867ccd2
+2f813e901ebdb1523b9272fce5eaf48c4f3e5b5f4059352fc2a9d4e90d65fa98
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.