diff for duplicates of <20190528090304.9388-12-daniel.vetter@ffwll.ch>

diff --git a/a/1.txt b/N1/1.txt
index 4ee3511..3c51e2f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -65,7 +65,7 @@ index dc46be38c970..1437695415c9 100644
 -			ch->display.height = monspec->max_y * 10;
 -
 -			if (!sh_mobile_lcdc_must_reconfigure(ch, mode) &&
--			    info->state == FBINFO_STATE_RUNNING) {
+-			    info->state = FBINFO_STATE_RUNNING) {
 -				/* First activation with the default monitor.
 -				 * Just turn on, if we run a resume here, the
 -				 * logo disappears.
@@ -117,7 +117,7 @@ index dc46be38c970..1437695415c9 100644
 -
  	/* Validate the format. */
  	format = sh_mobile_format_info(cfg->fourcc);
- 	if (format == NULL) {
+ 	if (format = NULL) {
 diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.h b/drivers/video/fbdev/sh_mobile_lcdcfb.h
 index b8e47a8bd8ab..589400372098 100644
 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.h
diff --git a/a/content_digest b/N1/content_digest
index a4a7f44..2cc4460 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,21 +8,20 @@
   "Subject\0[PATCH 11/33] fbdev/sh_mobile: remove sh_mobile_lcdc_display_notify\0"
 ]
 [
-  "Date\0Tue, 28 May 2019 11:02:42 +0200\0"
+  "Date\0Tue, 28 May 2019 09:02:42 +0000\0"
 ]
 [
   "To\0LKML <linux-kernel\@vger.kernel.org>\0"
 ]
 [
-  "Cc\0DRI Development <dri-devel\@lists.freedesktop.org>",
-  " Intel Graphics Development <intel-gfx\@lists.freedesktop.org>",
-  " linux-fbdev\@vger.kernel.org",
-  " Daniel Thompson <daniel.thompson\@linaro.org>",
+  "Cc\0Daniel Thompson <daniel.thompson\@linaro.org>",
+  " Geert Uytterhoeven <geert+renesas\@glider.be>",
   " Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
   " Daniel Vetter <daniel.vetter\@ffwll.ch>",
-  " Geert Uytterhoeven <geert+renesas\@glider.be>",
-  " Sam Ravnborg <sam\@ravnborg.org>",
-  " Maarten Lankhorst <maarten.lankhorst\@linux.intel.com>\0"
+  " Intel Graphics Development <intel-gfx\@lists.freedesktop.org>",
+  " linux-fbdev\@vger.kernel.org",
+  " DRI Development <dri-devel\@lists.freedesktop.org>",
+  " Sam Ravnborg <sam\@ravnborg.org>\0"
 ]
 [
   "\0000:1\0"
@@ -98,7 +97,7 @@
   "-\t\t\tch->display.height = monspec->max_y * 10;\n",
   "-\n",
   "-\t\t\tif (!sh_mobile_lcdc_must_reconfigure(ch, mode) &&\n",
-  "-\t\t\t    info->state == FBINFO_STATE_RUNNING) {\n",
+  "-\t\t\t    info->state = FBINFO_STATE_RUNNING) {\n",
   "-\t\t\t\t/* First activation with the default monitor.\n",
   "-\t\t\t\t * Just turn on, if we run a resume here, the\n",
   "-\t\t\t\t * logo disappears.\n",
@@ -150,7 +149,7 @@
   "-\n",
   " \t/* Validate the format. */\n",
   " \tformat = sh_mobile_format_info(cfg->fourcc);\n",
-  " \tif (format == NULL) {\n",
+  " \tif (format = NULL) {\n",
   "diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.h b/drivers/video/fbdev/sh_mobile_lcdcfb.h\n",
   "index b8e47a8bd8ab..589400372098 100644\n",
   "--- a/drivers/video/fbdev/sh_mobile_lcdcfb.h\n",
@@ -171,4 +170,4 @@
   "2.20.1"
 ]
 
-fbf62d4533f75457d2aaf14beaf244e78351b3f7a0ca1a6c7f10cea01d03ac7a
+f6cda4da90d47b4132dafda20ef30124f9971355ab9f68530e194d20dcf69fab
