diff for duplicates of <1521857244.3372.12.camel@mediatek.com>

diff --git a/a/1.txt b/N1/1.txt
index f445b96..f29c7df 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,8 +5,8 @@ On Fri, 2018-03-23 at 11:44 +0800, Ryder Lee wrote:
 > Cc: Bin Liu <bin.liu@mediatek.com>
 > Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
 > ---
->  drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--
->  1 file changed, 2 insertions(+), 2 deletions(-)
+> ?drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--
+> ?1 file changed, 2 insertions(+), 2 deletions(-)
 > 
 > diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
 > b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -15,23 +15,18 @@ On Fri, 2018-03-23 at 11:44 +0800, Ryder Lee wrote:
 > +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
 > @@ -1081,11 +1081,11 @@ static int mtk_jpeg_clk_init(struct
 > mtk_jpeg_dev *jpeg)
->  
->  	jpeg->clk_jdec = devm_clk_get(jpeg->dev, "jpgdec");
->  	if (IS_ERR(jpeg->clk_jdec))
+> ?
+> ?	jpeg->clk_jdec = devm_clk_get(jpeg->dev, "jpgdec");
+> ?	if (IS_ERR(jpeg->clk_jdec))
 > -		return -EINVAL;
 > +		return PTR_ERR(jpeg->clk_jdec);
->  
->  	jpeg->clk_jdec_smi = devm_clk_get(jpeg->dev, "jpgdec-smi");
->  	if (IS_ERR(jpeg->clk_jdec_smi))
+> ?
+> ?	jpeg->clk_jdec_smi = devm_clk_get(jpeg->dev, "jpgdec-smi");
+> ?	if (IS_ERR(jpeg->clk_jdec_smi))
 > -		return -EINVAL;
 > +		return PTR_ERR(jpeg->clk_jdec_smi);
->  
->  	return 0;
->  }
+> ?
+> ?	return 0;
+> ?}
 
 Acked-by: Rick Chang <rick.chang@mediatek.com>
-
-_______________________________________________
-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 eb22f3a..f4085a7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,15 +1,8 @@
  "ref\0f9295ecafa4c845ef5d9414fca47b2dc0fc6640d.1521776018.git.ryder.lee@mediatek.com\0"
- "From\0Rick Chang <rick.chang@mediatek.com>\0"
- "Subject\0Re: [PATCH] [media] vcodec: fix error return value from mtk_jpeg_clk_init()\0"
+ "From\0rick.chang@mediatek.com (Rick Chang)\0"
+ "Subject\0[PATCH] [media] vcodec: fix error return value from mtk_jpeg_clk_init()\0"
  "Date\0Fri, 23 Mar 2018 19:07:24 -0700\0"
- "To\0Ryder Lee <ryder.lee@mediatek.com>"
-  Mauro Carvalho Chehab <mchehab@kernel.org>
- " Hans Verkuil <hans.verkuil@cisco.com>\0"
- "Cc\0Bin Liu <bin.liu@mediatek.com>"
-  linux-mediatek@lists.infradead.org
-  linux-kernel@vger.kernel.org
-  linux-arm-kernel@lists.infradead.org
- " linux-media@vger.kernel.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, 2018-03-23 at 11:44 +0800, Ryder Lee wrote:\n"
@@ -19,8 +12,8 @@
  "> Cc: Bin Liu <bin.liu@mediatek.com>\n"
  "> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>\n"
  "> ---\n"
- "> \302\240drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--\n"
- "> \302\2401 file changed, 2 insertions(+), 2 deletions(-)\n"
+ "> ?drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--\n"
+ "> ?1 file changed, 2 insertions(+), 2 deletions(-)\n"
  "> \n"
  "> diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c\n"
  "> b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c\n"
@@ -29,25 +22,20 @@
  "> +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c\n"
  "> @@ -1081,11 +1081,11 @@ static int mtk_jpeg_clk_init(struct\n"
  "> mtk_jpeg_dev *jpeg)\n"
- "> \302\240\n"
- "> \302\240\tjpeg->clk_jdec = devm_clk_get(jpeg->dev, \"jpgdec\");\n"
- "> \302\240\tif (IS_ERR(jpeg->clk_jdec))\n"
+ "> ?\n"
+ "> ?\tjpeg->clk_jdec = devm_clk_get(jpeg->dev, \"jpgdec\");\n"
+ "> ?\tif (IS_ERR(jpeg->clk_jdec))\n"
  "> -\t\treturn -EINVAL;\n"
  "> +\t\treturn PTR_ERR(jpeg->clk_jdec);\n"
- "> \302\240\n"
- "> \302\240\tjpeg->clk_jdec_smi = devm_clk_get(jpeg->dev, \"jpgdec-smi\");\n"
- "> \302\240\tif (IS_ERR(jpeg->clk_jdec_smi))\n"
+ "> ?\n"
+ "> ?\tjpeg->clk_jdec_smi = devm_clk_get(jpeg->dev, \"jpgdec-smi\");\n"
+ "> ?\tif (IS_ERR(jpeg->clk_jdec_smi))\n"
  "> -\t\treturn -EINVAL;\n"
  "> +\t\treturn PTR_ERR(jpeg->clk_jdec_smi);\n"
- "> \302\240\n"
- "> \302\240\treturn 0;\n"
- "> \302\240}\n"
+ "> ?\n"
+ "> ?\treturn 0;\n"
+ "> ?}\n"
  "\n"
- "Acked-by: Rick Chang <rick.chang@mediatek.com>\n"
- "\n"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ Acked-by: Rick Chang <rick.chang@mediatek.com>
 
-1143b285b88c6ed2704b02cfb91473628e91b818a9149fbdfc3fe7c5b9a4cd05
+05cf032652ea3afdc6d74c9b260f55ad2616a354f22b526becc15d9b277b8f13
