diff for duplicates of <20150224145529.GA5498@hawk.usersys.redhat.com>

diff --git a/a/1.txt b/N1/1.txt
index 66d2723..d9c0589 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -75,3 +75,50 @@ double check my runs. In any case, while I like the approach of this
 series, the overhead is looking non-negligible.
 
 drew
+-------------- next part --------------
+#include <libcflat.h>
+
+static void prep_cc(void)
+{
+	asm volatile(
+	"	msr pmovsclr_el0, %0\n"
+	"	msr pmccfiltr_el0, %1\n"
+	"	msr pmcntenset_el0, %2\n"
+	"	msr pmcr_el0, %3\n"
+	"	isb\n"
+	:
+	: "r" (1 << 31), "r" (1 << 27), "r" (1 << 31),
+	  "r" (1 << 6 | 1 << 2 | 1 << 0));
+}
+
+int main(void)
+{
+	unsigned long start, end;
+	unsigned int sctlr;
+	int i, zeros = 0;
+
+	asm volatile("mrs %0, sctlr_el1" : "=&r" (sctlr));
+	prep_cc();
+
+	for (i = 0; i < 100000; ++i) {
+		asm volatile(
+		"	mrs %0, pmccntr_el0\n"
+		"	msr sctlr_el1, %2\n"
+		"	mrs %1, pmccntr_el0\n"
+		"	isb\n"
+		: "=&r" (start), "=&r" (end) : "r" (sctlr));
+
+		if ((i % 10) == 0)
+			printf("\n");
+
+		printf(" %d", end - start);
+
+		if ((end - start) == 0) {
+			++zeros;
+			prep_cc();
+		}
+	}
+
+	printf("\nnum zero counts = %d\n", zeros);
+	return 0;
+}
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index 5842822..0000000
--- a/a/2.hdr
+++ /dev/null
@@ -1,2 +0,0 @@
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: attachment; filename="trapcycles.c"
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index 5117e48..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <libcflat.h>
-
-static void prep_cc(void)
-{
-	asm volatile(
-	"	msr pmovsclr_el0, %0\n"
-	"	msr pmccfiltr_el0, %1\n"
-	"	msr pmcntenset_el0, %2\n"
-	"	msr pmcr_el0, %3\n"
-	"	isb\n"
-	:
-	: "r" (1 << 31), "r" (1 << 27), "r" (1 << 31),
-	  "r" (1 << 6 | 1 << 2 | 1 << 0));
-}
-
-int main(void)
-{
-	unsigned long start, end;
-	unsigned int sctlr;
-	int i, zeros = 0;
-
-	asm volatile("mrs %0, sctlr_el1" : "=&r" (sctlr));
-	prep_cc();
-
-	for (i = 0; i < 100000; ++i) {
-		asm volatile(
-		"	mrs %0, pmccntr_el0\n"
-		"	msr sctlr_el1, %2\n"
-		"	mrs %1, pmccntr_el0\n"
-		"	isb\n"
-		: "=&r" (start), "=&r" (end) : "r" (sctlr));
-
-		if ((i % 10) == 0)
-			printf("\n");
-
-		printf(" %d", end - start);
-
-		if ((end - start) == 0) {
-			++zeros;
-			prep_cc();
-		}
-	}
-
-	printf("\nnum zero counts = %d\n", zeros);
-	return 0;
-}
diff --git a/a/3.hdr b/a/3.hdr
deleted file mode 100644
index 4b86001..0000000
--- a/a/3.hdr
+++ /dev/null
@@ -1,4 +0,0 @@
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
diff --git a/a/3.txt b/a/3.txt
deleted file mode 100644
index f683022..0000000
--- a/a/3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-_______________________________________________
-kvmarm mailing list
-kvmarm@lists.cs.columbia.edu
-https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
diff --git a/a/content_digest b/N1/content_digest
index a619960..f03d344 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -6,17 +6,11 @@
  "ref\020150220142905.GA10942@hawk.usersys.redhat.com\0"
  "ref\0CAKv+Gu-YUzmnACZQi98OPRgKKL+gAGqwWYq2-_dwCdNqcktNUg@mail.gmail.com\0"
  "ref\020150220153626.GB10942@hawk.usersys.redhat.com\0"
- "From\0Andrew Jones <drjones@redhat.com>\0"
- "Subject\0Re: [RFC/RFT PATCH 0/3] arm64: KVM: work around incoherency with uncached guest mappings\0"
+ "From\0drjones@redhat.com (Andrew Jones)\0"
+ "Subject\0[RFC/RFT PATCH 0/3] arm64: KVM: work around incoherency with uncached guest mappings\0"
  "Date\0Tue, 24 Feb 2015 15:55:31 +0100\0"
- "To\0Ard Biesheuvel <ard.biesheuvel@linaro.org>\0"
- "Cc\0KVM devel mailing list <kvm@vger.kernel.org>"
-  Marc Zyngier <marc.zyngier@arm.com>
-  Paolo Bonzini <pbonzini@redhat.com>
-  Laszlo Ersek <lersek@redhat.com>
-  kvmarm@lists.cs.columbia.edu <kvmarm@lists.cs.columbia.edu>
- " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
- "\01:1\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
+ "\00:1\0"
  "b\0"
  "On Fri, Feb 20, 2015 at 04:36:26PM +0100, Andrew Jones wrote:\n"
  "> On Fri, Feb 20, 2015 at 02:37:25PM +0000, Ard Biesheuvel wrote:\n"
@@ -94,10 +88,8 @@
  "double check my runs. In any case, while I like the approach of this\n"
  "series, the overhead is looking non-negligible.\n"
  "\n"
- drew
- "\01:2\0"
- "fn\0trapcycles.c\0"
- "b\0"
+ "drew\n"
+ "-------------- next part --------------\n"
  "#include <libcflat.h>\n"
  "\n"
  "static void prep_cc(void)\n"
@@ -144,11 +136,5 @@
  "\tprintf(\"\\nnum zero counts = %d\\n\", zeros);\n"
  "\treturn 0;\n"
  }
- "\01:3\0"
- "b\0"
- "_______________________________________________\n"
- "kvmarm mailing list\n"
- "kvmarm@lists.cs.columbia.edu\n"
- https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
 
-7cc3c86a65b2c19fa04f136fce7f990d35d1fa418b87bf7c933540c7848770f3
+b3f2de9a2e59ca47e4389ed84ee0dd133880ad809fd4a91957c4c6a16e5c54db
