diff for duplicates of <56A11EF1.3070004@synopsys.com>

diff --git a/a/1.txt b/N1/1.txt
index 50a50ba..e989229 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -130,17 +130,18 @@ On 20-01-2016 01:24, Xinliang Liu wrote:
 >>>>>> {
 >>>>>> struct drm_encoder_slave *slave;
 >>>>>> const struct drm_encoder_slave_funcs *sfuncs;
->>>>>> struct arcpgu_drm_connector * con >>>>>> container_of(connector, struct arcpgu_drm_connector, connector);
+>>>>>> struct arcpgu_drm_connector * con =
+>>>>>> container_of(connector, struct arcpgu_drm_connector, connector);
 >>>>>>
 >>>>>> slave = con->encoder_slave;
->>>>>> if(slave = NULL) {
+>>>>>> if(slave == NULL) {
 >>>>>> dev_err(connector->dev->dev,
 >>>>>> "connector_get_modes: cannot find slave encoder for connector\n");
 >>>>>> return 0;
 >>>>>> }
 >>>>>>
 >>>>>> sfuncs = slave->slave_funcs;
->>>>>> if(sfuncs->get_modes = NULL){
+>>>>>> if(sfuncs->get_modes == NULL){
 >>>>>> return 0;
 >>>>>> }
 >>>>>>
@@ -214,3 +215,7 @@ On 20-01-2016 01:24, Xinliang Liu wrote:
 >>>>>>>
 >>>>>
 >>>>
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 3b21dec..cfc5f49 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -150,17 +150,18 @@
  ">>>>>> {\n"
  ">>>>>> struct drm_encoder_slave *slave;\n"
  ">>>>>> const struct drm_encoder_slave_funcs *sfuncs;\n"
- ">>>>>> struct arcpgu_drm_connector * con >>>>>> container_of(connector, struct arcpgu_drm_connector, connector);\n"
+ ">>>>>> struct arcpgu_drm_connector * con =\n"
+ ">>>>>> container_of(connector, struct arcpgu_drm_connector, connector);\n"
  ">>>>>>\n"
  ">>>>>> slave = con->encoder_slave;\n"
- ">>>>>> if(slave = NULL) {\n"
+ ">>>>>> if(slave == NULL) {\n"
  ">>>>>> dev_err(connector->dev->dev,\n"
  ">>>>>> \"connector_get_modes: cannot find slave encoder for connector\\n\");\n"
  ">>>>>> return 0;\n"
  ">>>>>> }\n"
  ">>>>>>\n"
  ">>>>>> sfuncs = slave->slave_funcs;\n"
- ">>>>>> if(sfuncs->get_modes = NULL){\n"
+ ">>>>>> if(sfuncs->get_modes == NULL){\n"
  ">>>>>> return 0;\n"
  ">>>>>> }\n"
  ">>>>>>\n"
@@ -233,6 +234,10 @@
  ">>>>>>>\n"
  ">>>>>>>\n"
  ">>>>>\n"
- >>>>
+ ">>>>\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ http://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-81192bb14ad62d15fe97d1fd94351a07193885eb6012e94a565b265f9ee26614
+9c036ce846343ddd9a75867082053add326a642eae75d0ceafa32aa292167b0d
