diff for duplicates of <20181017000027.23696-4-slongerbeam@gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index 4db6ec0..ade849f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -68,9 +68,9 @@ index 28f41caba05d..af7224846bd5 100644
 --- a/drivers/staging/media/imx/imx-ic-prpencvf.c
 +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
 @@ -412,7 +412,8 @@ static int prp_setup_channel(struct prp_priv *priv,
- 	if (image.pix.field == V4L2_FIELD_NONE &&
+ 	if (image.pix.field = V4L2_FIELD_NONE &&
  	    V4L2_FIELD_HAS_BOTH(infmt->field) &&
- 	    channel == priv->out_ch)
+ 	    channel = priv->out_ch)
 -		ipu_cpmem_interlaced_scan(channel, image.pix.bytesperline);
 +		ipu_cpmem_interlaced_scan(channel, image.pix.bytesperline,
 +					  image.pix.pixelformat);
@@ -82,7 +82,7 @@ index 7ecbd4d76d09..4aa20ae72608 100644
 --- a/drivers/staging/media/imx/imx-media-csi.c
 +++ b/drivers/staging/media/imx/imx-media-csi.c
 @@ -512,7 +512,8 @@ static int csi_idmac_setup_channel(struct csi_priv *priv)
- 	if (image.pix.field == V4L2_FIELD_NONE &&
+ 	if (image.pix.field = V4L2_FIELD_NONE &&
  	    V4L2_FIELD_HAS_BOTH(infmt->field))
  		ipu_cpmem_interlaced_scan(priv->idmac_ch,
 -					  image.pix.bytesperline);
diff --git a/a/content_digest b/N1/content_digest
index 6fdd7c2..c968014 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
   "Subject\0[PATCH v5 03/12] gpu: ipu-v3: Add planar support to interlaced scan\0"
 ]
 [
-  "Date\0Tue, 16 Oct 2018 17:00:18 -0700\0"
+  "Date\0Wed, 17 Oct 2018 00:00:18 +0000\0"
 ]
 [
   "To\0linux-media\@vger.kernel.org\0"
@@ -19,10 +19,10 @@
   " Mauro Carvalho Chehab <mchehab\@kernel.org>",
   " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
   " Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
-  " dri-devel\@lists.freedesktop.org (open list:DRM DRIVERS FOR FREESCALE IMX)",
-  " linux-kernel\@vger.kernel.org (open list)",
-  " devel\@driverdev.osuosl.org (open list:STAGING SUBSYSTEM)",
-  " linux-fbdev\@vger.kernel.org (open list:FRAMEBUFFER LAYER)\0"
+  " open list:DRM DRIVERS FOR FREESCALE IMX <dri-devel\@lists.freedesktop.org>",
+  " open list <linux-kernel\@vger.kernel.org>",
+  " open list:STAGING SUBSYSTEM <devel\@driverdev.osuosl.org>",
+  " open list:FRAMEBUFFER LAYER <linux-fbdev\@vger.kernel.org>\0"
 ]
 [
   "\0000:1\0"
@@ -101,9 +101,9 @@
   "--- a/drivers/staging/media/imx/imx-ic-prpencvf.c\n",
   "+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c\n",
   "\@\@ -412,7 +412,8 \@\@ static int prp_setup_channel(struct prp_priv *priv,\n",
-  " \tif (image.pix.field == V4L2_FIELD_NONE &&\n",
+  " \tif (image.pix.field = V4L2_FIELD_NONE &&\n",
   " \t    V4L2_FIELD_HAS_BOTH(infmt->field) &&\n",
-  " \t    channel == priv->out_ch)\n",
+  " \t    channel = priv->out_ch)\n",
   "-\t\tipu_cpmem_interlaced_scan(channel, image.pix.bytesperline);\n",
   "+\t\tipu_cpmem_interlaced_scan(channel, image.pix.bytesperline,\n",
   "+\t\t\t\t\t  image.pix.pixelformat);\n",
@@ -115,7 +115,7 @@
   "--- a/drivers/staging/media/imx/imx-media-csi.c\n",
   "+++ b/drivers/staging/media/imx/imx-media-csi.c\n",
   "\@\@ -512,7 +512,8 \@\@ static int csi_idmac_setup_channel(struct csi_priv *priv)\n",
-  " \tif (image.pix.field == V4L2_FIELD_NONE &&\n",
+  " \tif (image.pix.field = V4L2_FIELD_NONE &&\n",
   " \t    V4L2_FIELD_HAS_BOTH(infmt->field))\n",
   " \t\tipu_cpmem_interlaced_scan(priv->idmac_ch,\n",
   "-\t\t\t\t\t  image.pix.bytesperline);\n",
@@ -142,4 +142,4 @@
   "2.17.1"
 ]
 
-c0f3e3669346f995348f0e3091f8fd8943e14b09255af2f806f2a30f0402a331
+dd430cff76cb312e38038a370c0f6f071d236e1cfea44af0ff575736b2116cf0
