diff for duplicates of <20160214034444.GG6756@tiger>

diff --git a/a/1.txt b/N1/1.txt
index 44156de..9de98f7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -24,68 +24,68 @@ Shawn
 >  		bank-width = <2>;
 >  		device-width = <1>;
 > +
-> +		partition at 0 {
+> +		partition@0 {
 > +			/* 128KB for bank0 RCW */
 > +			reg = <0x00000000 0x00020000>;
 > +			label = "NOR bank0 RCW Image";
 > +		};
 > +
-> +		partition at 100000 {
+> +		partition@100000 {
 > +			/* 1MB for bank0 u-boot Image */
 > +			reg = <0x00100000 0x00100000>;
 > +			label = "NOR bank0 u-boot Image";
 > +		};
 > +
-> +		partition at 200000 {
+> +		partition@200000 {
 > +			/* 1MB for bank0 DTB */
 > +			reg = <0x00200000 0x00100000>;
 > +			label = "NOR bank0 DTB Image";
 > +		};
 > +
-> +		partition at 300000 {
+> +		partition@300000 {
 > +			/* 7MB for bank0 Linux Kernel */
 > +			reg = <0x00300000 0x00700000>;
 > +			label = "NOR bank0 Linux Kernel Image";
 > +		};
 > +
-> +		partition at a00000 {
+> +		partition@a00000 {
 > +			/* 54MB for bank0 Ramdisk Root File System */
 > +			reg = <0x00a00000 0x03600000>;
 > +			label = "NOR bank0 Ramdisk Root File System Image";
 > +		};
 > +
-> +		partition at 4000000 {
+> +		partition@4000000 {
 > +			/* 128KB for bank4 RCW */
 > +			reg = <0x04000000 0x00020000>;
 > +			label = "NOR bank4 RCW Image";
 > +		};
 > +
-> +		partition at 4100000 {
+> +		partition@4100000 {
 > +			/* 1MB for bank4 u-boot Image */
 > +			reg = <0x04100000 0x00100000>;
 > +			label = "NOR bank4 u-boot Image";
 > +		};
 > +
-> +		partition at 4200000 {
+> +		partition@4200000 {
 > +			/* 1MB for bank4 DTB */
 > +			reg = <0x04200000 0x00100000>;
 > +			label = "NOR bank4 DTB Image";
 > +		};
 > +
-> +		partition at 4300000 {
+> +		partition@4300000 {
 > +			/* 7MB for bank4 Linux Kernel */
 > +			reg = <0x04300000 0x00700000>;
 > +			label = "NOR bank4 Linux Kernel Image";
 > +		};
 > +
-> +		partition at 4a00000 {
+> +		partition@4a00000 {
 > +			/* 54MB for bank4 Ramdisk Root File System */
 > +			reg = <0x04a00000 0x03600000>;
 > +			label = "NOR bank4 Ramdisk Root File System Image";
 > +		};
 >  	};
 >  
->  	fpga: board-control at 3,0 {
+>  	fpga: board-control@3,0 {
 > diff --git a/arch/arm/boot/dts/ls1021a-twr.dts b/arch/arm/boot/dts/ls1021a-twr.dts
 > index 75ecaed..f5e9616 100644
 > --- a/arch/arm/boot/dts/ls1021a-twr.dts
@@ -95,61 +95,61 @@ Shawn
 >  		bank-width = <2>;
 >  		device-width = <1>;
 > +
-> +		partition at 0 {
+> +		partition@0 {
 > +			/* 128KB for bank0 RCW */
 > +			reg = <0x00000000 0x00020000>;
 > +			label = "NOR bank0 RCW Image";
 > +		};
 > +
-> +		partition at 100000 {
+> +		partition@100000 {
 > +			/* 1MB for bank0 u-boot Image */
 > +			reg = <0x00100000 0x00100000>;
 > +			label = "NOR bank0 u-boot Image";
 > +		};
 > +
-> +		partition at 200000 {
+> +		partition@200000 {
 > +			/* 1MB for bank0 DTB */
 > +			reg = <0x00200000 0x00100000>;
 > +			label = "NOR bank0 DTB Image";
 > +		};
 > +
-> +		partition at 300000 {
+> +		partition@300000 {
 > +			/* 7MB for bank0 Linux Kernel */
 > +			reg = <0x00300000 0x00700000>;
 > +			label = "NOR bank0 Linux Kernel Image";
 > +		};
 > +
-> +		partition at a00000 {
+> +		partition@a00000 {
 > +			/* 54MB for bank0 Ramdisk Root File System */
 > +			reg = <0x00a00000 0x03600000>;
 > +			label = "NOR bank0 Ramdisk Root File System Image";
 > +		};
 > +
-> +		partition at 4000000 {
+> +		partition@4000000 {
 > +			/* 128KB for bank4 RCW */
 > +			reg = <0x04000000 0x00020000>;
 > +			label = "NOR bank4 RCW Image";
 > +		};
 > +
-> +		partition at 4100000 {
+> +		partition@4100000 {
 > +			/* 1MB for bank4 u-boot Image */
 > +			reg = <0x04100000 0x00100000>;
 > +			label = "NOR bank4 u-boot Image";
 > +		};
 > +
-> +		partition at 4200000 {
+> +		partition@4200000 {
 > +			/* 1MB for bank4 DTB */
 > +			reg = <0x04200000 0x00100000>;
 > +			label = "NOR bank4 DTB Image";
 > +		};
 > +
-> +		partition at 4300000 {
+> +		partition@4300000 {
 > +			/* 7MB for bank4 Linux Kernel */
 > +			reg = <0x04300000 0x00700000>;
 > +			label = "NOR bank4 Linux Kernel Image";
 > +		};
 > +
-> +		partition at 4a00000 {
+> +		partition@4a00000 {
 > +			/* 54MB for bank4 Ramdisk Root File System */
 > +			reg = <0x04a00000 0x03600000>;
 > +			label = "NOR bank4 Ramdisk Root File System Image";
@@ -163,6 +163,6 @@ Shawn
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> 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 87f54cf..636a76d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,10 @@
  "ref\01454487404-330-1-git-send-email-b18965@freescale.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH] dts: ls102xa: ifc: Add the partition for NOR flash\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH] dts: ls102xa: ifc: Add the partition for NOR flash\0"
  "Date\0Sun, 14 Feb 2016 11:44:44 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Alison Wang <b18965@freescale.com>\0"
+ "Cc\0linux-arm-kernel@lists.infradead.org"
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "On Wed, Feb 03, 2016 at 04:16:44PM +0800, Alison Wang wrote:\n"
@@ -31,68 +33,68 @@
  ">  \t\tbank-width = <2>;\n"
  ">  \t\tdevice-width = <1>;\n"
  "> +\n"
- "> +\t\tpartition at 0 {\n"
+ "> +\t\tpartition@0 {\n"
  "> +\t\t\t/* 128KB for bank0 RCW */\n"
  "> +\t\t\treg = <0x00000000 0x00020000>;\n"
  "> +\t\t\tlabel = \"NOR bank0 RCW Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 100000 {\n"
+ "> +\t\tpartition@100000 {\n"
  "> +\t\t\t/* 1MB for bank0 u-boot Image */\n"
  "> +\t\t\treg = <0x00100000 0x00100000>;\n"
  "> +\t\t\tlabel = \"NOR bank0 u-boot Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 200000 {\n"
+ "> +\t\tpartition@200000 {\n"
  "> +\t\t\t/* 1MB for bank0 DTB */\n"
  "> +\t\t\treg = <0x00200000 0x00100000>;\n"
  "> +\t\t\tlabel = \"NOR bank0 DTB Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 300000 {\n"
+ "> +\t\tpartition@300000 {\n"
  "> +\t\t\t/* 7MB for bank0 Linux Kernel */\n"
  "> +\t\t\treg = <0x00300000 0x00700000>;\n"
  "> +\t\t\tlabel = \"NOR bank0 Linux Kernel Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at a00000 {\n"
+ "> +\t\tpartition@a00000 {\n"
  "> +\t\t\t/* 54MB for bank0 Ramdisk Root File System */\n"
  "> +\t\t\treg = <0x00a00000 0x03600000>;\n"
  "> +\t\t\tlabel = \"NOR bank0 Ramdisk Root File System Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 4000000 {\n"
+ "> +\t\tpartition@4000000 {\n"
  "> +\t\t\t/* 128KB for bank4 RCW */\n"
  "> +\t\t\treg = <0x04000000 0x00020000>;\n"
  "> +\t\t\tlabel = \"NOR bank4 RCW Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 4100000 {\n"
+ "> +\t\tpartition@4100000 {\n"
  "> +\t\t\t/* 1MB for bank4 u-boot Image */\n"
  "> +\t\t\treg = <0x04100000 0x00100000>;\n"
  "> +\t\t\tlabel = \"NOR bank4 u-boot Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 4200000 {\n"
+ "> +\t\tpartition@4200000 {\n"
  "> +\t\t\t/* 1MB for bank4 DTB */\n"
  "> +\t\t\treg = <0x04200000 0x00100000>;\n"
  "> +\t\t\tlabel = \"NOR bank4 DTB Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 4300000 {\n"
+ "> +\t\tpartition@4300000 {\n"
  "> +\t\t\t/* 7MB for bank4 Linux Kernel */\n"
  "> +\t\t\treg = <0x04300000 0x00700000>;\n"
  "> +\t\t\tlabel = \"NOR bank4 Linux Kernel Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 4a00000 {\n"
+ "> +\t\tpartition@4a00000 {\n"
  "> +\t\t\t/* 54MB for bank4 Ramdisk Root File System */\n"
  "> +\t\t\treg = <0x04a00000 0x03600000>;\n"
  "> +\t\t\tlabel = \"NOR bank4 Ramdisk Root File System Image\";\n"
  "> +\t\t};\n"
  ">  \t};\n"
  ">  \n"
- ">  \tfpga: board-control at 3,0 {\n"
+ ">  \tfpga: board-control@3,0 {\n"
  "> diff --git a/arch/arm/boot/dts/ls1021a-twr.dts b/arch/arm/boot/dts/ls1021a-twr.dts\n"
  "> index 75ecaed..f5e9616 100644\n"
  "> --- a/arch/arm/boot/dts/ls1021a-twr.dts\n"
@@ -102,61 +104,61 @@
  ">  \t\tbank-width = <2>;\n"
  ">  \t\tdevice-width = <1>;\n"
  "> +\n"
- "> +\t\tpartition at 0 {\n"
+ "> +\t\tpartition@0 {\n"
  "> +\t\t\t/* 128KB for bank0 RCW */\n"
  "> +\t\t\treg = <0x00000000 0x00020000>;\n"
  "> +\t\t\tlabel = \"NOR bank0 RCW Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 100000 {\n"
+ "> +\t\tpartition@100000 {\n"
  "> +\t\t\t/* 1MB for bank0 u-boot Image */\n"
  "> +\t\t\treg = <0x00100000 0x00100000>;\n"
  "> +\t\t\tlabel = \"NOR bank0 u-boot Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 200000 {\n"
+ "> +\t\tpartition@200000 {\n"
  "> +\t\t\t/* 1MB for bank0 DTB */\n"
  "> +\t\t\treg = <0x00200000 0x00100000>;\n"
  "> +\t\t\tlabel = \"NOR bank0 DTB Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 300000 {\n"
+ "> +\t\tpartition@300000 {\n"
  "> +\t\t\t/* 7MB for bank0 Linux Kernel */\n"
  "> +\t\t\treg = <0x00300000 0x00700000>;\n"
  "> +\t\t\tlabel = \"NOR bank0 Linux Kernel Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at a00000 {\n"
+ "> +\t\tpartition@a00000 {\n"
  "> +\t\t\t/* 54MB for bank0 Ramdisk Root File System */\n"
  "> +\t\t\treg = <0x00a00000 0x03600000>;\n"
  "> +\t\t\tlabel = \"NOR bank0 Ramdisk Root File System Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 4000000 {\n"
+ "> +\t\tpartition@4000000 {\n"
  "> +\t\t\t/* 128KB for bank4 RCW */\n"
  "> +\t\t\treg = <0x04000000 0x00020000>;\n"
  "> +\t\t\tlabel = \"NOR bank4 RCW Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 4100000 {\n"
+ "> +\t\tpartition@4100000 {\n"
  "> +\t\t\t/* 1MB for bank4 u-boot Image */\n"
  "> +\t\t\treg = <0x04100000 0x00100000>;\n"
  "> +\t\t\tlabel = \"NOR bank4 u-boot Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 4200000 {\n"
+ "> +\t\tpartition@4200000 {\n"
  "> +\t\t\t/* 1MB for bank4 DTB */\n"
  "> +\t\t\treg = <0x04200000 0x00100000>;\n"
  "> +\t\t\tlabel = \"NOR bank4 DTB Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 4300000 {\n"
+ "> +\t\tpartition@4300000 {\n"
  "> +\t\t\t/* 7MB for bank4 Linux Kernel */\n"
  "> +\t\t\treg = <0x04300000 0x00700000>;\n"
  "> +\t\t\tlabel = \"NOR bank4 Linux Kernel Image\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpartition at 4a00000 {\n"
+ "> +\t\tpartition@4a00000 {\n"
  "> +\t\t\t/* 54MB for bank4 Ramdisk Root File System */\n"
  "> +\t\t\treg = <0x04a00000 0x03600000>;\n"
  "> +\t\t\tlabel = \"NOR bank4 Ramdisk Root File System Image\";\n"
@@ -170,8 +172,8 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel@lists.infradead.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  >
 
-2e0c490166f040f3a2ea781aa9ad86205f75af9754c7a104d46585876150a47a
+b74290c3227c0e9f9c0cf25a69a992d0804a366aa907c7db642876d8bfea3199
