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

diff --git a/a/1.txt b/N1/1.txt
index c21511f..d675109 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -124,7 +124,7 @@ index aa0e30a2ba18..4a15e513fa05 100644
 -	height = mbus_fmt->height;
 +	width = infmt->width;
 +	height = infmt->height;
-+	if (infmt->field == V4L2_FIELD_ALTERNATE)
++	if (infmt->field = V4L2_FIELD_ALTERNATE)
 +		height *= 2;
  
  	/* Set the CSI_SENS_CONF register remaining fields */
@@ -133,7 +133,7 @@ index aa0e30a2ba18..4a15e513fa05 100644
  		ipu_csi_write(csi, 0xFF0000, CSI_CCIR_CODE_3);
  		break;
  	case IPU_CSI_CLK_MODE_CCIR656_INTERLACED:
--		if (mbus_fmt->width == 720 && mbus_fmt->height == 576) {
+-		if (mbus_fmt->width = 720 && mbus_fmt->height = 576) {
 -			/*
 -			 * PAL case
 -			 *
@@ -148,7 +148,7 @@ index aa0e30a2ba18..4a15e513fa05 100644
 -					  CSI_CCIR_CODE_1);
 -			ipu_csi_write(csi, 0xD07DF, CSI_CCIR_CODE_2);
 -			ipu_csi_write(csi, 0xFF0000, CSI_CCIR_CODE_3);
--		} else if (mbus_fmt->width == 720 && mbus_fmt->height == 480) {
+-		} else if (mbus_fmt->width = 720 && mbus_fmt->height = 480) {
 -			/*
 -			 * NTSC case
 -			 *
@@ -163,10 +163,10 @@ index aa0e30a2ba18..4a15e513fa05 100644
 -					  CSI_CCIR_CODE_1);
 -			ipu_csi_write(csi, 0x40596, CSI_CCIR_CODE_2);
 -			ipu_csi_write(csi, 0xFF0000, CSI_CCIR_CODE_3);
-+		if (width == 720 && height == 480) {
++		if (width = 720 && height = 480) {
 +			std = V4L2_STD_NTSC;
 +			height = 525;
-+		} else if (width == 720 && height == 576) {
++		} else if (width = 720 && height = 576) {
 +			std = V4L2_STD_PAL;
 +			height = 625;
  		} else {
@@ -243,8 +243,8 @@ index 4223f8d418ae..7ecbd4d76d09 100644
  	}
  
 @@ -702,7 +695,7 @@ static int csi_setup(struct csi_priv *priv)
- 			     priv->crop.width == 2 * priv->compose.width,
- 			     priv->crop.height == 2 * priv->compose.height);
+ 			     priv->crop.width = 2 * priv->compose.width,
+ 			     priv->crop.height = 2 * priv->compose.height);
  
 -	ipu_csi_init_interface(priv->csi, &mbus_cfg, &if_fmt);
 +	ipu_csi_init_interface(priv->csi, &mbus_cfg, &infmt, &outfmt);
diff --git a/a/content_digest b/N1/content_digest
index f018815..0ae7b7d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,21 +8,21 @@
   "Subject\0[PATCH v5 02/12] gpu: ipu-csi: Swap fields according to input/output field types\0"
 ]
 [
-  "Date\0Tue, 16 Oct 2018 17:00:17 -0700\0"
+  "Date\0Wed, 17 Oct 2018 00:00:17 +0000\0"
 ]
 [
   "To\0linux-media\@vger.kernel.org\0"
 ]
 [
-  "Cc\0Steve Longerbeam <slongerbeam\@gmail.com>",
-  " Philipp Zabel <p.zabel\@pengutronix.de>",
-  " Mauro Carvalho Chehab <mchehab\@kernel.org>",
-  " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
+  "Cc\0open list:STAGING SUBSYSTEM <devel\@driverdev.osuosl.org>",
+  " open list:FRAMEBUFFER LAYER <linux-fbdev\@vger.kernel.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"
+  " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
+  " open list <linux-kernel\@vger.kernel.org>",
+  " open list:DRM DRIVERS FOR FREESCALE IMX <dri-devel\@lists.freedesktop.org>",
+  " Philipp Zabel <p.zabel\@pengutronix.de>",
+  " Steve Longerbeam <slongerbeam\@gmail.com>",
+  " Mauro Carvalho Chehab <mchehab\@kernel.org>\0"
 ]
 [
   "\0000:1\0"
@@ -157,7 +157,7 @@
   "-\theight = mbus_fmt->height;\n",
   "+\twidth = infmt->width;\n",
   "+\theight = infmt->height;\n",
-  "+\tif (infmt->field == V4L2_FIELD_ALTERNATE)\n",
+  "+\tif (infmt->field = V4L2_FIELD_ALTERNATE)\n",
   "+\t\theight *= 2;\n",
   " \n",
   " \t/* Set the CSI_SENS_CONF register remaining fields */\n",
@@ -166,7 +166,7 @@
   " \t\tipu_csi_write(csi, 0xFF0000, CSI_CCIR_CODE_3);\n",
   " \t\tbreak;\n",
   " \tcase IPU_CSI_CLK_MODE_CCIR656_INTERLACED:\n",
-  "-\t\tif (mbus_fmt->width == 720 && mbus_fmt->height == 576) {\n",
+  "-\t\tif (mbus_fmt->width = 720 && mbus_fmt->height = 576) {\n",
   "-\t\t\t/*\n",
   "-\t\t\t * PAL case\n",
   "-\t\t\t *\n",
@@ -181,7 +181,7 @@
   "-\t\t\t\t\t  CSI_CCIR_CODE_1);\n",
   "-\t\t\tipu_csi_write(csi, 0xD07DF, CSI_CCIR_CODE_2);\n",
   "-\t\t\tipu_csi_write(csi, 0xFF0000, CSI_CCIR_CODE_3);\n",
-  "-\t\t} else if (mbus_fmt->width == 720 && mbus_fmt->height == 480) {\n",
+  "-\t\t} else if (mbus_fmt->width = 720 && mbus_fmt->height = 480) {\n",
   "-\t\t\t/*\n",
   "-\t\t\t * NTSC case\n",
   "-\t\t\t *\n",
@@ -196,10 +196,10 @@
   "-\t\t\t\t\t  CSI_CCIR_CODE_1);\n",
   "-\t\t\tipu_csi_write(csi, 0x40596, CSI_CCIR_CODE_2);\n",
   "-\t\t\tipu_csi_write(csi, 0xFF0000, CSI_CCIR_CODE_3);\n",
-  "+\t\tif (width == 720 && height == 480) {\n",
+  "+\t\tif (width = 720 && height = 480) {\n",
   "+\t\t\tstd = V4L2_STD_NTSC;\n",
   "+\t\t\theight = 525;\n",
-  "+\t\t} else if (width == 720 && height == 576) {\n",
+  "+\t\t} else if (width = 720 && height = 576) {\n",
   "+\t\t\tstd = V4L2_STD_PAL;\n",
   "+\t\t\theight = 625;\n",
   " \t\t} else {\n",
@@ -276,8 +276,8 @@
   " \t}\n",
   " \n",
   "\@\@ -702,7 +695,7 \@\@ static int csi_setup(struct csi_priv *priv)\n",
-  " \t\t\t     priv->crop.width == 2 * priv->compose.width,\n",
-  " \t\t\t     priv->crop.height == 2 * priv->compose.height);\n",
+  " \t\t\t     priv->crop.width = 2 * priv->compose.width,\n",
+  " \t\t\t     priv->crop.height = 2 * priv->compose.height);\n",
   " \n",
   "-\tipu_csi_init_interface(priv->csi, &mbus_cfg, &if_fmt);\n",
   "+\tipu_csi_init_interface(priv->csi, &mbus_cfg, &infmt, &outfmt);\n",
@@ -302,4 +302,4 @@
   "2.17.1"
 ]
 
-a41b8803c5521152b95d0eacc90b83558991091fd06eddccf834ff228d0a8cd8
+71eecdcffe94c91028f75ec4894ba6650b6d8cf1df0aba627a5e087d77f77b8b
