diff for duplicates of <6d3553bfe8a2d1ac88cab852100616a7@localhost>

diff --git a/a/1.txt b/N1/1.txt
index a1e975f..2b4530a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -65,3 +65,29 @@ Thanks,
         M.
 -- 
 Fast, cheap, reliable. Pick two.
+-------------- next part --------------
+diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
+index 658a15d..b21b97f 100644
+--- a/arch/arm/include/asm/assembler.h
++++ b/arch/arm/include/asm/assembler.h
+@@ -254,16 +254,17 @@
+ 	mov	lr , \reg
+ 	and	lr , lr , #MODE_MASK
+ 	cmp	lr , #HYP_MODE
+-	orr	\reg , \reg , #PSR_A_BIT | PSR_I_BIT | PSR_F_BIT
++	orr	\reg , \reg , #PSR_I_BIT | PSR_F_BIT
+ 	bic	\reg , \reg , #MODE_MASK
+ 	orr	\reg , \reg , #SVC_MODE
+ THUMB(	orr	\reg , \reg , #PSR_T_BIT	)
+-	msr	spsr_cxsf, \reg
+-	adr	lr, BSYM(2f)
+ 	bne	1f
++	orr	\reg, \reg, #PSR_A_BIT
++	adr	lr, BSYM(2f)
++	msr	spsr_cxsf, \reg
+ 	__MSR_ELR_HYP(14)
+ 	__ERET
+-1:	movs	pc, lr
++1:	msr	cpsr_c, \reg
+ 2:
+ .endm
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index 918b3e3..0000000
--- a/a/2.hdr
+++ /dev/null
@@ -1,5 +0,0 @@
-Content-Transfer-Encoding: base64
-Content-Type: text/plain; charset=us-ascii; charset=UTF-8;
- name=setmode.patch
-Content-Disposition: attachment;
- filename=setmode.patch
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index 8b49a79..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
-index 658a15d..b21b97f 100644
---- a/arch/arm/include/asm/assembler.h
-+++ b/arch/arm/include/asm/assembler.h
-@@ -254,16 +254,17 @@
- 	mov	lr , \reg
- 	and	lr , lr , #MODE_MASK
- 	cmp	lr , #HYP_MODE
--	orr	\reg , \reg , #PSR_A_BIT | PSR_I_BIT | PSR_F_BIT
-+	orr	\reg , \reg , #PSR_I_BIT | PSR_F_BIT
- 	bic	\reg , \reg , #MODE_MASK
- 	orr	\reg , \reg , #SVC_MODE
- THUMB(	orr	\reg , \reg , #PSR_T_BIT	)
--	msr	spsr_cxsf, \reg
--	adr	lr, BSYM(2f)
- 	bne	1f
-+	orr	\reg, \reg, #PSR_A_BIT
-+	adr	lr, BSYM(2f)
-+	msr	spsr_cxsf, \reg
- 	__MSR_ELR_HYP(14)
- 	__ERET
--1:	movs	pc, lr
-+1:	msr	cpsr_c, \reg
- 2:
- .endm
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 8133cf0..0000000
--- a/a/3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index dcec9ae..010cdba 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,16 +1,11 @@
  "ref\01347036934-8519-1-git-send-email-marc.zyngier@arm.com\0"
  "ref\01347036934-8519-3-git-send-email-marc.zyngier@arm.com\0"
  "ref\020121005200822.GQ3874@atomide.com\0"
- "From\0Marc Zyngier <marc.zyngier@arm.com>\0"
- "Subject\0Re: [PATCH v2 2/7] ARM: virt: allow the kernel to be entered in HYP mode\0"
+ "From\0marc.zyngier@arm.com (Marc Zyngier)\0"
+ "Subject\0[PATCH v2 2/7] ARM: virt: allow the kernel to be entered in HYP mode\0"
  "Date\0Sat, 06 Oct 2012 12:18:23 +0200\0"
- "To\0Tony Lindgren <tony@atomide.com>\0"
- "Cc\0Dave Martin <dave.martin@linaro.org>"
-  linux-omap@vger.kernel.org
-  Russell King - ARM Linux <linux@arm.linux.org.uk>
-  linux-arm-kernel@lists.infradead.org
- " Nicolas Pitre <nico@fluxnic.net>\0"
- "\01:1\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
+ "\00:1\0"
  "b\0"
  "Hi Tony,\n"
  "\n"
@@ -78,10 +73,8 @@
  "\n"
  "        M.\n"
  "-- \n"
- Fast, cheap, reliable. Pick two.
- "\01:2\0"
- "fn\0setmode.patch\0"
- "b\0"
+ "Fast, cheap, reliable. Pick two.\n"
+ "-------------- next part --------------\n"
  "diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h\n"
  "index 658a15d..b21b97f 100644\n"
  "--- a/arch/arm/include/asm/assembler.h\n"
@@ -107,11 +100,5 @@
  "+1:\tmsr\tcpsr_c, \\reg\n"
  " 2:\n"
   .endm
- "\01:3\0"
- "b\0"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-7e41d1ef8740f75b8fe4eeb14a7665fb27c7c928e75a504fd31df4885d25dfb1
+abcd444796b0bc92568c3d74b38196ca91f094277d15e085038aff5428a37ec3
