diff for duplicates of <100a1528a551627c86ec00b7e50c82e515707f01.camel@collabora.com>

diff --git a/a/1.txt b/N1/1.txt
index 35bf37d..01bcd93 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -68,9 +68,3 @@ Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
 >  	pix_mp->field = V4L2_FIELD_NONE;
 >  
 >  	return 0;
-
-
-_______________________________________________
-Linux-rockchip mailing list
-Linux-rockchip@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-rockchip
diff --git a/a/content_digest b/N1/content_digest
index cd3e55e..5dc925a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -87,12 +87,6 @@
  "> +\trkvdec_fill_decoded_pixfmt(ctx, pix_mp);\n"
  ">  \tpix_mp->field = V4L2_FIELD_NONE;\n"
  ">  \n"
- ">  \treturn 0;\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "Linux-rockchip mailing list\n"
- "Linux-rockchip@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-rockchip
+ ">  \treturn 0;"
 
-bf07fb8531f4c10d66af057c0b3503bb6599c74f95855a61747aae4fdd190f1c
+6c3218f3a52f0fcba76268a54b1946fb4b68991ffa15d7a7ca7ecee3fae704a4
