diff for duplicates of <E1bYDEs-0004rs-FP@rmk-PC.armlinux.org.uk>

diff --git a/a/1.txt b/N1/1.txt
index 5d9b632..ad06872 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -117,7 +117,7 @@ index 000000000000..9d6b8daa584d
 +	struct dw_hdmi_cec *cec = adap->priv;
 +	u32 addresses;
 +
-+	if (logical_addr = CEC_LOG_ADDR_INVALID)
++	if (logical_addr == CEC_LOG_ADDR_INVALID)
 +		addresses = cec->addresses = BIT(15);
 +	else
 +		addresses = cec->addresses |= BIT(logical_addr);
@@ -152,7 +152,7 @@ index 000000000000..9d6b8daa584d
 +	unsigned stat = readb_relaxed(cec->base + HDMI_IH_CEC_STAT0);
 +	irqreturn_t ret = IRQ_HANDLED;
 +
-+	if (stat = 0)
++	if (stat == 0)
 +		return IRQ_NONE;
 +
 +	writeb_relaxed(stat, cec->base + HDMI_IH_CEC_STAT0);
@@ -186,7 +186,8 @@ index 000000000000..9d6b8daa584d
 +			len = sizeof(cec->rx_msg.msg);
 +
 +		for (i = 0; i < len; i++)
-+			cec->rx_msg.msg[i] +				readb_relaxed(base + HDMI_CEC_RX_DATA0 + i);
++			cec->rx_msg.msg[i] =
++				readb_relaxed(base + HDMI_CEC_RX_DATA0 + i);
 +
 +		writeb_relaxed(0, base + HDMI_CEC_LOCK);
 +
@@ -255,7 +256,7 @@ index 000000000000..9d6b8daa584d
 +
 +static unsigned int parse_hdmi_addr(const struct edid *edid)
 +{
-+	if (!edid || edid->extensions = 0)
++	if (!edid || edid->extensions == 0)
 +		return (u16)~0;
 +
 +	return cec_get_edid_phys_addr((u8 *)edid,
diff --git a/a/content_digest b/N1/content_digest
index 6a610da..f621129 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,14 +1,8 @@
  "ref\020160812141421.GB1041@n2100.armlinux.org.uk\0"
- "From\0Russell King <rmk+kernel@arm.linux.org.uk>\0"
+ "From\0rmk+kernel@arm.linux.org.uk (Russell King)\0"
  "Subject\0[PATCH RFC 4/5] drm/bridge: add dw-hdmi cec driver using Hans Verkil's CEC code\0"
- "Date\0Fri, 12 Aug 2016 14:15:10 +0000\0"
- "To\0David Airlie <airlied@linux.ie>"
-  Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
-  Tomi Valkeinen <tomi.valkeinen@ti.com>
- " Hans Verkuil <hansverk@cisco.com>\0"
- "Cc\0linux-fbdev@vger.kernel.org"
-  linux-arm-kernel@lists.infradead.org
- " dri-devel@lists.freedesktop.org\0"
+ "Date\0Fri, 12 Aug 2016 15:15:10 +0100\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Add a CEC driver for the dw-hdmi hardware using Hans Verkil's CEC\n"
@@ -130,7 +124,7 @@
  "+\tstruct dw_hdmi_cec *cec = adap->priv;\n"
  "+\tu32 addresses;\n"
  "+\n"
- "+\tif (logical_addr = CEC_LOG_ADDR_INVALID)\n"
+ "+\tif (logical_addr == CEC_LOG_ADDR_INVALID)\n"
  "+\t\taddresses = cec->addresses = BIT(15);\n"
  "+\telse\n"
  "+\t\taddresses = cec->addresses |= BIT(logical_addr);\n"
@@ -165,7 +159,7 @@
  "+\tunsigned stat = readb_relaxed(cec->base + HDMI_IH_CEC_STAT0);\n"
  "+\tirqreturn_t ret = IRQ_HANDLED;\n"
  "+\n"
- "+\tif (stat = 0)\n"
+ "+\tif (stat == 0)\n"
  "+\t\treturn IRQ_NONE;\n"
  "+\n"
  "+\twriteb_relaxed(stat, cec->base + HDMI_IH_CEC_STAT0);\n"
@@ -199,7 +193,8 @@
  "+\t\t\tlen = sizeof(cec->rx_msg.msg);\n"
  "+\n"
  "+\t\tfor (i = 0; i < len; i++)\n"
- "+\t\t\tcec->rx_msg.msg[i] +\t\t\t\treadb_relaxed(base + HDMI_CEC_RX_DATA0 + i);\n"
+ "+\t\t\tcec->rx_msg.msg[i] =\n"
+ "+\t\t\t\treadb_relaxed(base + HDMI_CEC_RX_DATA0 + i);\n"
  "+\n"
  "+\t\twriteb_relaxed(0, base + HDMI_CEC_LOCK);\n"
  "+\n"
@@ -268,7 +263,7 @@
  "+\n"
  "+static unsigned int parse_hdmi_addr(const struct edid *edid)\n"
  "+{\n"
- "+\tif (!edid || edid->extensions = 0)\n"
+ "+\tif (!edid || edid->extensions == 0)\n"
  "+\t\treturn (u16)~0;\n"
  "+\n"
  "+\treturn cec_get_edid_phys_addr((u8 *)edid,\n"
@@ -583,4 +578,4 @@
  "-- \n"
  2.1.0
 
-7e3fefa9f2c6e1979f0e28cb2207fd81c2903d839653a93617f9b3ba6c3c519c
+1c53b0316355d7bec15788284b20455ddaf4581c2c6cadf944a37d0c7c25264a
