diff for duplicates of <20180109133136.1dae4259@bbrezillon>

diff --git a/a/1.txt b/N1/1.txt
index d35021f..1df5ebc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -25,10 +25,10 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
 > index 927b65e14219..a3c3969c1992 100644
 > --- a/Documentation/gpu/kms-properties.csv
 > +++ b/Documentation/gpu/kms-properties.csv
-> @@ -99,5 +99,5 @@ radeon,DVI-I,?coherent?,RANGE,"Min=0, Max=1",Connector,TBD
+> @@ -99,5 +99,5 @@ radeon,DVI-I,“coherent”,RANGE,"Min=0, Max=1",Connector,TBD
 >  ,,"""underscan vborder""",RANGE,"Min=0, Max=128",Connector,TBD
->  ,Audio,?audio?,ENUM,"{ ""off"", ""on"", ""auto"" }",Connector,TBD
->  ,FMT Dithering,?dither?,ENUM,"{ ""off"", ""on"" }",Connector,TBD
+>  ,Audio,“audio”,ENUM,"{ ""off"", ""on"", ""auto"" }",Connector,TBD
+>  ,FMT Dithering,“dither”,ENUM,"{ ""off"", ""on"" }",Connector,TBD
 > -rcar-du,Generic,"""alpha""",RANGE,"Min=0, Max=255",Plane,TBD
 > +,,"""alpha""",RANGE,"Min=0, Max=255",Plane,Opacity of the plane from transparent (0) to opaque (255)
 >  ,,"""colorkey""",RANGE,"Min=0, Max=0x01ffffff",Plane,TBD
@@ -159,3 +159,8 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
 >  	struct drm_property *zpos_property;
 >  	struct drm_property *rotation_property;
 >  };
+
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 8d83e29..bf3e30c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,17 @@
  "ref\0cover.713e47b83733ed05f0c38f5ba6ef8b6c1e32805c.1515494838.git-series.maxime.ripard@free-electrons.com\0"
  "ref\05c765fc730d75cb362dc37bcdb3b3aeacc7bdb30.1515494838.git-series.maxime.ripard@free-electrons.com\0"
- "From\0boris.brezillon@free-electrons.com (Boris Brezillon)\0"
- "Subject\0[PATCH 06/19] drm/blend: Add a generic alpha property\0"
+ "From\0Boris Brezillon <boris.brezillon@free-electrons.com>\0"
+ "Subject\0Re: [PATCH 06/19] drm/blend: Add a generic alpha property\0"
  "Date\0Tue, 9 Jan 2018 13:31:36 +0100\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Maxime Ripard <maxime.ripard@free-electrons.com>\0"
+ "Cc\0Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"
+  Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+  linux-kernel@vger.kernel.org
+  dri-devel@lists.freedesktop.org
+  Chen-Yu Tsai <wens@csie.org>
+  Daniel Vetter <daniel.vetter@intel.com>
+  linux-arm-kernel@lists.infradead.org
+ " thomas@vitsch.nl\0"
  "\00:1\0"
  "b\0"
  "On Tue,  9 Jan 2018 11:56:25 +0100\n"
@@ -33,10 +41,10 @@
  "> index 927b65e14219..a3c3969c1992 100644\n"
  "> --- a/Documentation/gpu/kms-properties.csv\n"
  "> +++ b/Documentation/gpu/kms-properties.csv\n"
- "> @@ -99,5 +99,5 @@ radeon,DVI-I,?coherent?,RANGE,\"Min=0, Max=1\",Connector,TBD\n"
+ "> @@ -99,5 +99,5 @@ radeon,DVI-I,\342\200\234coherent\342\200\235,RANGE,\"Min=0, Max=1\",Connector,TBD\n"
  ">  ,,\"\"\"underscan vborder\"\"\",RANGE,\"Min=0, Max=128\",Connector,TBD\n"
- ">  ,Audio,?audio?,ENUM,\"{ \"\"off\"\", \"\"on\"\", \"\"auto\"\" }\",Connector,TBD\n"
- ">  ,FMT Dithering,?dither?,ENUM,\"{ \"\"off\"\", \"\"on\"\" }\",Connector,TBD\n"
+ ">  ,Audio,\342\200\234audio\342\200\235,ENUM,\"{ \"\"off\"\", \"\"on\"\", \"\"auto\"\" }\",Connector,TBD\n"
+ ">  ,FMT Dithering,\342\200\234dither\342\200\235,ENUM,\"{ \"\"off\"\", \"\"on\"\" }\",Connector,TBD\n"
  "> -rcar-du,Generic,\"\"\"alpha\"\"\",RANGE,\"Min=0, Max=255\",Plane,TBD\n"
  "> +,,\"\"\"alpha\"\"\",RANGE,\"Min=0, Max=255\",Plane,Opacity of the plane from transparent (0) to opaque (255)\n"
  ">  ,,\"\"\"colorkey\"\"\",RANGE,\"Min=0, Max=0x01ffffff\",Plane,TBD\n"
@@ -166,6 +174,11 @@
  "> +\tstruct drm_property *alpha_property;\n"
  ">  \tstruct drm_property *zpos_property;\n"
  ">  \tstruct drm_property *rotation_property;\n"
- >  };
+ ">  };\n"
+ "\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-8b213ac4598e3a47d2dd3c963e84f9219a9adcf4fa5cfe2bd87c59dd4a56214a
+aed677d5fc9b458432d50816acfa7db6619b034a394f18c88cb7a1f78498e424
