diff for duplicates of <1488378936.14858.1.camel@collabora.com>

diff --git a/a/1.1.hdr b/a/1.1.hdr
deleted file mode 100644
index 9a40e9f..0000000
--- a/a/1.1.hdr
+++ /dev/null
@@ -1,2 +0,0 @@
-Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: quoted-printable
diff --git a/a/1.2.bin b/a/1.2.bin
deleted file mode 100644
index 0a59cdd..0000000
--- a/a/1.2.bin
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEABECAAYFAli23DgACgkQcVMCLawGqBxDjQCdGQYKG+5PC1phQPy6DGLX4H6O
-kQ4AnR7HeXAhb4oppq2PnIh/7UwLR36v
-=GzeV
------END PGP SIGNATURE-----
diff --git a/a/1.2.hdr b/a/1.2.hdr
deleted file mode 100644
index da6d245..0000000
--- a/a/1.2.hdr
+++ /dev/null
@@ -1,3 +0,0 @@
-Content-Type: application/pgp-signature; name="signature.asc"
-Content-Description: This is a digitally signed message part
-Content-Transfer-Encoding: 7bit
diff --git a/a/1.1.txt b/N1/1.txt
similarity index 67%
rename from a/1.1.txt
rename to N1/1.txt
index a87269b..ad3eedf 100644
--- a/a/1.1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-Le mercredi 01 mars 2017 à 14:12 +0100, Andrzej Hajda a écrit :
+Le mercredi 01 mars 2017 ? 14:12 +0100, Andrzej Hajda a ?crit?:
 > On 01.03.2017 12:51, Thibault Saunier wrote:
 > > It is required by the standard that the field order is set by the
 > > driver, default to NONE in case any is provided, but we can
@@ -46,8 +46,8 @@ That is exact.
 > > 
 > > Changes in v6:
 > > - Pass user output field value to the capture as the device is not
-> >   doing any deinterlacing and thus decoded content will still be
-> >   interlaced on the output.
+> > ? doing any deinterlacing and thus decoded content will still be
+> > ? interlaced on the output.
 > > 
 > > Changes in v5:
 > > - Just adapt the field and never error out.
@@ -61,9 +61,9 @@ That is exact.
 > > - Fix a silly build error that slipped in while rebasing the
 > > patches
 > > 
-> >  drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 ++
-> >  drivers/media/platform/s5p-mfc/s5p_mfc_dec.c    | 6 +++++-
-> >  2 files changed, 7 insertions(+), 1 deletion(-)
+> > ?drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 ++
+> > ?drivers/media/platform/s5p-mfc/s5p_mfc_dec.c????| 6 +++++-
+> > ?2 files changed, 7 insertions(+), 1 deletion(-)
 > > 
 > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
 > > b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -71,15 +71,15 @@ That is exact.
 > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
 > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
 > > @@ -652,6 +652,8 @@ struct s5p_mfc_ctx {
-> >  	size_t me_buffer_size;
-> >  	size_t tmv_buffer_size;
-> >  
+> > ?	size_t me_buffer_size;
+> > ?	size_t tmv_buffer_size;
+> > ?
 > > +	enum v4l2_field field;
 > > +
-> >  	enum v4l2_mpeg_mfc51_video_force_frame_type
+> > ?	enum v4l2_mpeg_mfc51_video_force_frame_type
 > > force_frame_type;
-> >  
-> >  	struct list_head ref_queue;
+> > ?
+> > ?	struct list_head ref_queue;
 > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
 > > b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
 > > index 367ef8e8dbf0..6e5ca86fb331 100644
@@ -87,35 +87,42 @@ That is exact.
 > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
 > > @@ -345,7 +345,7 @@ static int vidioc_g_fmt(struct file *file, void
 > > *priv, struct v4l2_format *f)
-> >  		   rectangle. */
-> >  		pix_mp->width = ctx->buf_width;
-> >  		pix_mp->height = ctx->buf_height;
+> > ?		???rectangle. */
+> > ?		pix_mp->width = ctx->buf_width;
+> > ?		pix_mp->height = ctx->buf_height;
 > > -		pix_mp->field = V4L2_FIELD_NONE;
 > > +		pix_mp->field = ctx->field;
-> >  		pix_mp->num_planes = 2;
-> >  		/* Set pixelformat to the format in which MFC
-> >  		   outputs the decoded frame */
+> > ?		pix_mp->num_planes = 2;
+> > ?		/* Set pixelformat to the format in which MFC
+> > ?		???outputs the decoded frame */
 > > @@ -380,6 +380,9 @@ static int vidioc_try_fmt(struct file *file,
 > > void *priv, struct v4l2_format *f)
-> >  	struct s5p_mfc_dev *dev = video_drvdata(file);
-> >  	struct s5p_mfc_fmt *fmt;
-> >  
+> > ?	struct s5p_mfc_dev *dev = video_drvdata(file);
+> > ?	struct s5p_mfc_fmt *fmt;
+> > ?
 > > +	if (f->fmt.pix.field == V4L2_FIELD_ANY)
 > > +		f->fmt.pix.field = V4L2_FIELD_NONE;
 > > +
-> >  	mfc_debug(2, "Type is %d\n", f->type);
-> >  	if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
-> >  		fmt = find_format(f, MFC_FMT_DEC);
+> > ?	mfc_debug(2, "Type is %d\n", f->type);
+> > ?	if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+> > ?		fmt = find_format(f, MFC_FMT_DEC);
 > > @@ -436,6 +439,7 @@ static int vidioc_s_fmt(struct file *file, void
 > > *priv, struct v4l2_format *f)
-> >  		goto out;
-> >  	} else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
-> >  		/* src_fmt is validated by call to vidioc_try_fmt
+> > ?		goto out;
+> > ?	} else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+> > ?		/* src_fmt is validated by call to vidioc_try_fmt
 > > */
 > > +		ctx->field = f->fmt.pix.field;
-> >  		ctx->src_fmt = find_format(f, MFC_FMT_DEC);
-> >  		ctx->codec_mode = ctx->src_fmt->codec_mode;
-> >  		mfc_debug(2, "The codec number is: %d\n", ctx-
+> > ?		ctx->src_fmt = find_format(f, MFC_FMT_DEC);
+> > ?		ctx->codec_mode = ctx->src_fmt->codec_mode;
+> > ?		mfc_debug(2, "The codec number is: %d\n", ctx-
 > > >codec_mode);
 > 
->
+> 
+-------------- next part --------------
+A non-text attachment was scrubbed...
+Name: signature.asc
+Type: application/pgp-signature
+Size: 181 bytes
+Desc: This is a digitally signed message part
+URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170301/5b8317db/attachment-0001.sig>
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index 4b86001..0000000
--- a/a/2.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/2.txt b/a/2.txt
deleted file mode 100644
index 8133cf0..0000000
--- a/a/2.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 19e1bd7..e4fb825 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,32 +2,13 @@
  "ref\0CGME20170301115141epcas2p37801b1fbe0951cc37a4e01bf2bcae3da@epcas2p3.samsung.com\0"
  "ref\020170301115108.14187-3-thibault.saunier@osg.samsung.com\0"
  "ref\033dbd3fa-04b2-3d94-5163-0a10589ff1c7@samsung.com\0"
- "From\0Nicolas Dufresne <nicolas.dufresne@collabora.com>\0"
- "Subject\0Re: [PATCH v6 2/2] [media] s5p-mfc: Handle 'v4l2_pix_format:field' in try_fmt and g_fmt\0"
+ "From\0nicolas.dufresne@collabora.com (Nicolas Dufresne)\0"
+ "Subject\0[PATCH v6 2/2] [media] s5p-mfc: Handle 'v4l2_pix_format:field' in try_fmt and g_fmt\0"
  "Date\0Wed, 01 Mar 2017 09:35:36 -0500\0"
- "To\0Andrzej Hajda <a.hajda@samsung.com>"
-  Thibault Saunier <thibault.saunier@osg.samsung.com>
- " linux-kernel@vger.kernel.org\0"
- "Cc\0Inki Dae <inki.dae@samsung.com>"
-  Ulf Hansson <ulf.hansson@linaro.org>
-  linux-samsung-soc@vger.kernel.org
-  Jeongtae Park <jtp.park@samsung.com>
-  Shuah Khan <shuahkh@osg.samsung.com>
-  Andi Shyti <andi.shyti@samsung.com>
-  Kamil Debski <kamil@wypas.org>
-  Mauro Carvalho Chehab <mchehab@s-opensource.com>
-  Javier Martinez Canillas <javier@osg.samsung.com>
-  Kyungmin Park <kyungmin.park@samsung.com>
-  Kukjin Kim <kgene@kernel.org>
-  Krzysztof Kozlowski <krzk@kernel.org>
-  Sylwester Nawrocki <s.nawrocki@samsung.com>
-  Marek Szyprowski <m.szyprowski@samsung.com>
-  Mauro Carvalho Chehab <mchehab@kernel.org>
-  linux-arm-kernel@lists.infradead.org
- " linux-media@vger.kernel.org\0"
- "\02:1.1\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
+ "\00:1\0"
  "b\0"
- "Le mercredi 01 mars 2017 \303\240 14:12 +0100, Andrzej Hajda a \303\251crit\302\240:\n"
+ "Le mercredi 01 mars 2017 ? 14:12 +0100, Andrzej Hajda a ?crit?:\n"
  "> On 01.03.2017 12:51, Thibault Saunier wrote:\n"
  "> > It is required by the standard that the field order is set by the\n"
  "> > driver, default to NONE in case any is provided, but we can\n"
@@ -75,8 +56,8 @@
  "> > \n"
  "> > Changes in v6:\n"
  "> > - Pass user output field value to the capture as the device is not\n"
- "> > \302\240 doing any deinterlacing and thus decoded content will still be\n"
- "> > \302\240 interlaced on the output.\n"
+ "> > ? doing any deinterlacing and thus decoded content will still be\n"
+ "> > ? interlaced on the output.\n"
  "> > \n"
  "> > Changes in v5:\n"
  "> > - Just adapt the field and never error out.\n"
@@ -90,9 +71,9 @@
  "> > - Fix a silly build error that slipped in while rebasing the\n"
  "> > patches\n"
  "> > \n"
- "> > \302\240drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 ++\n"
- "> > \302\240drivers/media/platform/s5p-mfc/s5p_mfc_dec.c\302\240\302\240\302\240\302\240| 6 +++++-\n"
- "> > \302\2402 files changed, 7 insertions(+), 1 deletion(-)\n"
+ "> > ?drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 ++\n"
+ "> > ?drivers/media/platform/s5p-mfc/s5p_mfc_dec.c????| 6 +++++-\n"
+ "> > ?2 files changed, 7 insertions(+), 1 deletion(-)\n"
  "> > \n"
  "> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h\n"
  "> > b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h\n"
@@ -100,15 +81,15 @@
  "> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h\n"
  "> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h\n"
  "> > @@ -652,6 +652,8 @@ struct s5p_mfc_ctx {\n"
- "> > \302\240\tsize_t me_buffer_size;\n"
- "> > \302\240\tsize_t tmv_buffer_size;\n"
- "> > \302\240\n"
+ "> > ?\tsize_t me_buffer_size;\n"
+ "> > ?\tsize_t tmv_buffer_size;\n"
+ "> > ?\n"
  "> > +\tenum v4l2_field field;\n"
  "> > +\n"
- "> > \302\240\tenum v4l2_mpeg_mfc51_video_force_frame_type\n"
+ "> > ?\tenum v4l2_mpeg_mfc51_video_force_frame_type\n"
  "> > force_frame_type;\n"
- "> > \302\240\n"
- "> > \302\240\tstruct list_head ref_queue;\n"
+ "> > ?\n"
+ "> > ?\tstruct list_head ref_queue;\n"
  "> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c\n"
  "> > b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c\n"
  "> > index 367ef8e8dbf0..6e5ca86fb331 100644\n"
@@ -116,54 +97,44 @@
  "> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c\n"
  "> > @@ -345,7 +345,7 @@ static int vidioc_g_fmt(struct file *file, void\n"
  "> > *priv, struct v4l2_format *f)\n"
- "> > \302\240\t\t\302\240\302\240\302\240rectangle. */\n"
- "> > \302\240\t\tpix_mp->width = ctx->buf_width;\n"
- "> > \302\240\t\tpix_mp->height = ctx->buf_height;\n"
+ "> > ?\t\t???rectangle. */\n"
+ "> > ?\t\tpix_mp->width = ctx->buf_width;\n"
+ "> > ?\t\tpix_mp->height = ctx->buf_height;\n"
  "> > -\t\tpix_mp->field = V4L2_FIELD_NONE;\n"
  "> > +\t\tpix_mp->field = ctx->field;\n"
- "> > \302\240\t\tpix_mp->num_planes = 2;\n"
- "> > \302\240\t\t/* Set pixelformat to the format in which MFC\n"
- "> > \302\240\t\t\302\240\302\240\302\240outputs the decoded frame */\n"
+ "> > ?\t\tpix_mp->num_planes = 2;\n"
+ "> > ?\t\t/* Set pixelformat to the format in which MFC\n"
+ "> > ?\t\t???outputs the decoded frame */\n"
  "> > @@ -380,6 +380,9 @@ static int vidioc_try_fmt(struct file *file,\n"
  "> > void *priv, struct v4l2_format *f)\n"
- "> > \302\240\tstruct s5p_mfc_dev *dev = video_drvdata(file);\n"
- "> > \302\240\tstruct s5p_mfc_fmt *fmt;\n"
- "> > \302\240\n"
+ "> > ?\tstruct s5p_mfc_dev *dev = video_drvdata(file);\n"
+ "> > ?\tstruct s5p_mfc_fmt *fmt;\n"
+ "> > ?\n"
  "> > +\tif (f->fmt.pix.field == V4L2_FIELD_ANY)\n"
  "> > +\t\tf->fmt.pix.field = V4L2_FIELD_NONE;\n"
  "> > +\n"
- "> > \302\240\tmfc_debug(2, \"Type is %d\\n\", f->type);\n"
- "> > \302\240\tif (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {\n"
- "> > \302\240\t\tfmt = find_format(f, MFC_FMT_DEC);\n"
+ "> > ?\tmfc_debug(2, \"Type is %d\\n\", f->type);\n"
+ "> > ?\tif (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {\n"
+ "> > ?\t\tfmt = find_format(f, MFC_FMT_DEC);\n"
  "> > @@ -436,6 +439,7 @@ static int vidioc_s_fmt(struct file *file, void\n"
  "> > *priv, struct v4l2_format *f)\n"
- "> > \302\240\t\tgoto out;\n"
- "> > \302\240\t} else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {\n"
- "> > \302\240\t\t/* src_fmt is validated by call to vidioc_try_fmt\n"
+ "> > ?\t\tgoto out;\n"
+ "> > ?\t} else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {\n"
+ "> > ?\t\t/* src_fmt is validated by call to vidioc_try_fmt\n"
  "> > */\n"
  "> > +\t\tctx->field = f->fmt.pix.field;\n"
- "> > \302\240\t\tctx->src_fmt = find_format(f, MFC_FMT_DEC);\n"
- "> > \302\240\t\tctx->codec_mode = ctx->src_fmt->codec_mode;\n"
- "> > \302\240\t\tmfc_debug(2, \"The codec number is: %d\\n\", ctx-\n"
+ "> > ?\t\tctx->src_fmt = find_format(f, MFC_FMT_DEC);\n"
+ "> > ?\t\tctx->codec_mode = ctx->src_fmt->codec_mode;\n"
+ "> > ?\t\tmfc_debug(2, \"The codec number is: %d\\n\", ctx-\n"
  "> > >codec_mode);\n"
  "> \n"
- >
- "\02:1.2\0"
- "fn\0signature.asc\0"
- "d\0This is a digitally signed message part\0"
- "b\0"
- "-----BEGIN PGP SIGNATURE-----\n"
- "Version: GnuPG v2\n"
- "\n"
- "iEYEABECAAYFAli23DgACgkQcVMCLawGqBxDjQCdGQYKG+5PC1phQPy6DGLX4H6O\n"
- "kQ4AnR7HeXAhb4oppq2PnIh/7UwLR36v\n"
- "=GzeV\n"
- "-----END PGP SIGNATURE-----\n"
- "\01:2\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
+ "> \n"
+ "-------------- next part --------------\n"
+ "A non-text attachment was scrubbed...\n"
+ "Name: signature.asc\n"
+ "Type: application/pgp-signature\n"
+ "Size: 181 bytes\n"
+ "Desc: This is a digitally signed message part\n"
+ URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170301/5b8317db/attachment-0001.sig>
 
-944e1bb145627e335888c022c26099196e7d875e32fd6db59216dad5b56eb91a
+47e81cd7aa884561163d2c77b8e81eddfd2505ee7f2d41fafeb5197ddbc4d6a3
