diff for duplicates of <56E28B5D.6000708@st.com>

diff --git a/a/1.txt b/N1/1.txt
index fbbe142..19a2d4a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,10 +1,10 @@
 On 3/10/2016 5:47 PM, Dinh Nguyen wrote:
 > On Thu, Mar 10, 2016 at 3:13 AM, Giuseppe CAVALLARO
-> <peppe.cavallaro-qxv4g6HH51o@public.gmane.org> wrote:
+> <peppe.cavallaro@st.com> wrote:
 >> On 3/9/2016 5:31 PM, Dinh Nguyen wrote:
 >>>
 >>> On Wed, Mar 9, 2016 at 8:53 AM, Giuseppe CAVALLARO
->>> <peppe.cavallaro-qxv4g6HH51o@public.gmane.org> wrote:
+>>> <peppe.cavallaro@st.com> wrote:
 >>>>
 >>>> Hi Tomeu, Dinh, Andreas
 >>>>
@@ -76,3 +76,10 @@ Peppe
 >
 > Dinh
 >
+-------------- next part --------------
+A non-text attachment was scrubbed...
+Name: 0001-stmmac-fix-tx-prepare-for-normal-desc.patch
+Type: text/x-patch
+Size: 1221 bytes
+Desc: not available
+URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160311/5f65d1f1/attachment.bin>
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index 3aeae27..0000000
--- a/a/2.hdr
+++ /dev/null
@@ -1,5 +0,0 @@
-Content-Type: text/x-patch;
-	name="0001-stmmac-fix-tx-prepare-for-normal-desc.patch"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
-	filename="0001-stmmac-fix-tx-prepare-for-normal-desc.patch"
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index d2f13b3..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-From ed3e38befc5500e05f46e1d52ea20a0b8d3829f3 Mon Sep 17 00:00:00 2001
-From: Giuseppe Cavallaro <peppe.cavallaro-qxv4g6HH51o@public.gmane.org>
-Date: Thu, 10 Mar 2016 14:57:48 +0100
-Subject: [PATCH (linux-sti-4.1)] stmmac: fix tx prepare for normal desc
-
-This patch fixes a bug inside when use the normal descriptors.
-While preparing the tx descriptor the frame size was not
-properly set.
-
-Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro-qxv4g6HH51o@public.gmane.org>
----
- drivers/net/ethernet/stmicro/stmmac/norm_desc.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
-index e13228f..432b3f1 100644
---- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
-@@ -197,13 +197,15 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
- 				  bool csum_flag, int mode, bool tx_own,
- 				  bool ls)
- {
--	unsigned int tdes1 = p->des1;
-+	unsigned int tdes1;
- 
- 	if (mode == STMMAC_CHAIN_MODE)
- 		norm_set_tx_desc_len_on_chain(p, len);
- 	else
- 		norm_set_tx_desc_len_on_ring(p, len);
- 
-+	tdes1 = p->des1;
-+
- 	if (is_fs)
- 		tdes1 |= TDES1_FIRST_SEGMENT;
- 	else
--- 
-1.7.4.4
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 de42eaa..0000000
--- a/a/3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-_______________________________________________
-Linux-rockchip mailing list
-Linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-http://lists.infradead.org/mailman/listinfo/linux-rockchip
diff --git a/a/content_digest b/N1/content_digest
index 8dbb26e..26f91e3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -18,37 +18,24 @@
  "ref\056DFF253.9050208@st.com\0"
  "ref\056DFFA9E.7060602@st.com\0"
  "ref\0CAAObsKBUzBXcamEyup44N1bYUzGr_ZZTsYcD5x3PXb-2E00cGA@mail.gmail.com\0"
- "ref\056E033C8.40506@st.c om\0"
+ "ref\056E033C8.40506@st.com\0"
  "ref\056E038CE.606@st.com\0"
  "ref\0CADhT+wcMpzA_Coj8Z5OQZsc3bF3a7yOmsbazQMPtcdUWkJSuCA@mail.gmail.com\0"
  "ref\056E13AAB.2080900@st.com\0"
  "ref\0CADhT+wd=vcph2y_OxkGNO5EwHvN=kBy-BrfZHmNjZHww4LxmTg@mail.gmail.com\0"
- "ref\0CADhT+wd=vcph2y_OxkGNO5EwHvN=kBy-BrfZHmNjZHww4LxmTg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org\0"
- "From\0Giuseppe CAVALLARO <peppe.cavallaro-qxv4g6HH51o@public.gmane.org>\0"
- "Subject\0Re: [PATCH v3 0/8] arm64: rockchip: Initial GeekBox enablement\0"
+ "From\0peppe.cavallaro@st.com (Giuseppe CAVALLARO)\0"
+ "Subject\0[PATCH v3 0/8] arm64: rockchip: Initial GeekBox enablement\0"
  "Date\0Fri, 11 Mar 2016 10:09:49 +0100\0"
- "To\0Dinh Nguyen <dinh.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>"
- " Tomeu Vizoso <tomeu-XCtybt49RKsYaV1qd6yewg@public.gmane.org>\0"
- "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>"
- " Heiko St\303\274bner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>"
-  netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  LKML <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
- " Frank Sch\303\244fer <fschaefer.oss-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>"
-  open list:ARM/Rockchip SoC... <linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>
-  Gabriel Fernandez <gabriel.fernandez-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-  Fabrice GASNIER <fabrice.gasnier-qxv4g6HH51o@public.gmane.org>
- " Andreas F\303\244rber <afaerber-l3A5Bk7waGM@public.gmane.org>"
-  LAKML <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>
- " Alexandre TORGUE <alexandre.torgue-qxv4g6HH51o@public.gmane.org>\0"
- "\01:1\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
+ "\00:1\0"
  "b\0"
  "On 3/10/2016 5:47 PM, Dinh Nguyen wrote:\n"
  "> On Thu, Mar 10, 2016 at 3:13 AM, Giuseppe CAVALLARO\n"
- "> <peppe.cavallaro-qxv4g6HH51o@public.gmane.org> wrote:\n"
+ "> <peppe.cavallaro@st.com> wrote:\n"
  ">> On 3/9/2016 5:31 PM, Dinh Nguyen wrote:\n"
  ">>>\n"
  ">>> On Wed, Mar 9, 2016 at 8:53 AM, Giuseppe CAVALLARO\n"
- ">>> <peppe.cavallaro-qxv4g6HH51o@public.gmane.org> wrote:\n"
+ ">>> <peppe.cavallaro@st.com> wrote:\n"
  ">>>>\n"
  ">>>> Hi Tomeu, Dinh, Andreas\n"
  ">>>>\n"
@@ -119,52 +106,13 @@
  "\n"
  ">\n"
  "> Dinh\n"
- >
- "\01:2\0"
- "fn\00001-stmmac-fix-tx-prepare-for-normal-desc.patch\0"
- "b\0"
- "From ed3e38befc5500e05f46e1d52ea20a0b8d3829f3 Mon Sep 17 00:00:00 2001\n"
- "From: Giuseppe Cavallaro <peppe.cavallaro-qxv4g6HH51o@public.gmane.org>\n"
- "Date: Thu, 10 Mar 2016 14:57:48 +0100\n"
- "Subject: [PATCH (linux-sti-4.1)] stmmac: fix tx prepare for normal desc\n"
- "\n"
- "This patch fixes a bug inside when use the normal descriptors.\n"
- "While preparing the tx descriptor the frame size was not\n"
- "properly set.\n"
- "\n"
- "Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro-qxv4g6HH51o@public.gmane.org>\n"
- "---\n"
- " drivers/net/ethernet/stmicro/stmmac/norm_desc.c |    4 +++-\n"
- " 1 files changed, 3 insertions(+), 1 deletions(-)\n"
- "\n"
- "diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c\n"
- "index e13228f..432b3f1 100644\n"
- "--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c\n"
- "+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c\n"
- "@@ -197,13 +197,15 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,\n"
- " \t\t\t\t  bool csum_flag, int mode, bool tx_own,\n"
- " \t\t\t\t  bool ls)\n"
- " {\n"
- "-\tunsigned int tdes1 = p->des1;\n"
- "+\tunsigned int tdes1;\n"
- " \n"
- " \tif (mode == STMMAC_CHAIN_MODE)\n"
- " \t\tnorm_set_tx_desc_len_on_chain(p, len);\n"
- " \telse\n"
- " \t\tnorm_set_tx_desc_len_on_ring(p, len);\n"
- " \n"
- "+\ttdes1 = p->des1;\n"
- "+\n"
- " \tif (is_fs)\n"
- " \t\ttdes1 |= TDES1_FIRST_SEGMENT;\n"
- " \telse\n"
- "-- \n"
- 1.7.4.4
- "\01:3\0"
- "b\0"
- "_______________________________________________\n"
- "Linux-rockchip mailing list\n"
- "Linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-rockchip
+ ">\n"
+ "-------------- next part --------------\n"
+ "A non-text attachment was scrubbed...\n"
+ "Name: 0001-stmmac-fix-tx-prepare-for-normal-desc.patch\n"
+ "Type: text/x-patch\n"
+ "Size: 1221 bytes\n"
+ "Desc: not available\n"
+ URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160311/5f65d1f1/attachment.bin>
 
-52e1db4d5e6bcb67a66eb7d9c61f1a2436500f100020e9477dd6cdc5a2b1fe15
+8fca81dcd9d7ae6349579384562828a4b3faaa97d11b061433e780edb6342cb3
