diff for duplicates of <20180603144223.728956901@twibright.com>

diff --git a/a/1.txt b/N1/1.txt
index 59f3dd8..16c03d4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,8 @@ Cc: stable@vger.kernel.org
  2 files changed, 17 insertions(+), 2 deletions(-)
 
 Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c
-=================================--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c	2018-05-31 14:49:52.000000000 +0200
+===================================================================
+--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c	2018-05-31 14:49:52.000000000 +0200
 +++ linux-4.17-rc7/drivers/video/fbdev/udlfb.c	2018-05-31 14:49:52.000000000 +0200
 @@ -1041,10 +1041,24 @@ static int dlfb_ops_set_par(struct fb_in
  	int result;
@@ -35,13 +36,13 @@ Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c
  
  	result = dlfb_set_video_mode(dlfb, &info->var);
  
--	if ((result = 0) && (dlfb->fb_count = 0)) {
+-	if ((result == 0) && (dlfb->fb_count == 0)) {
 +	if (result)
 +		return result;
 +
 +	dlfb->current_mode = fvs;
 +
-+	if (dlfb->fb_count = 0) {
++	if (dlfb->fb_count == 0) {
  
  		/* paint greenscreen */
  
@@ -55,7 +56,8 @@ Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c
  
  /* To fonzi the jukebox (e.g. make blanking changes take effect) */
 Index: linux-4.17-rc7/include/video/udlfb.h
-=================================--- linux-4.17-rc7.orig/include/video/udlfb.h	2018-05-31 14:49:52.000000000 +0200
+===================================================================
+--- linux-4.17-rc7.orig/include/video/udlfb.h	2018-05-31 14:49:52.000000000 +0200
 +++ linux-4.17-rc7/include/video/udlfb.h	2018-05-31 14:49:52.000000000 +0200
 @@ -56,6 +56,7 @@ struct dlfb_data {
  	atomic_t bytes_identical; /* saved effort with backbuffer comparison */
@@ -65,3 +67,8 @@ Index: linux-4.17-rc7/include/video/udlfb.h
  };
  
  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
+
+_______________________________________________
+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 3f090ef..cb7cd55 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\020180603144053.875668929@twibright.com\0"
  "From\0Mikulas Patocka <mpatocka@redhat.com>\0"
  "Subject\0[PATCH 13/21] udlfb: dont switch if we are switching to the same videomode\0"
- "Date\0Sun, 03 Jun 2018 14:41:06 +0000\0"
+ "Date\0Sun, 03 Jun 2018 16:41:06 +0200\0"
  "To\0Mikulas Patocka <mpatocka@redhat.com>"
   Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
   Dave Airlie <airlied@redhat.com>
@@ -10,6 +10,7 @@
  "Cc\0linux-fbdev@vger.kernel.org"
  " dri-devel@lists.freedesktop.org\0"
  "\00:1\0"
+ "fn\0udl-cache-videomode-2.patch\0"
  "b\0"
  "The udlfb driver reprograms the hardware everytime the user switches the\n"
  "console, that makes quite unusable when working on the console.\n"
@@ -30,7 +31,8 @@
  " 2 files changed, 17 insertions(+), 2 deletions(-)\n"
  "\n"
  "Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c\n"
- "=================================--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c\t2018-05-31 14:49:52.000000000 +0200\n"
+ "===================================================================\n"
+ "--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c\t2018-05-31 14:49:52.000000000 +0200\n"
  "+++ linux-4.17-rc7/drivers/video/fbdev/udlfb.c\t2018-05-31 14:49:52.000000000 +0200\n"
  "@@ -1041,10 +1041,24 @@ static int dlfb_ops_set_par(struct fb_in\n"
  " \tint result;\n"
@@ -48,13 +50,13 @@
  " \n"
  " \tresult = dlfb_set_video_mode(dlfb, &info->var);\n"
  " \n"
- "-\tif ((result = 0) && (dlfb->fb_count = 0)) {\n"
+ "-\tif ((result == 0) && (dlfb->fb_count == 0)) {\n"
  "+\tif (result)\n"
  "+\t\treturn result;\n"
  "+\n"
  "+\tdlfb->current_mode = fvs;\n"
  "+\n"
- "+\tif (dlfb->fb_count = 0) {\n"
+ "+\tif (dlfb->fb_count == 0) {\n"
  " \n"
  " \t\t/* paint greenscreen */\n"
  " \n"
@@ -68,7 +70,8 @@
  " \n"
  " /* To fonzi the jukebox (e.g. make blanking changes take effect) */\n"
  "Index: linux-4.17-rc7/include/video/udlfb.h\n"
- "=================================--- linux-4.17-rc7.orig/include/video/udlfb.h\t2018-05-31 14:49:52.000000000 +0200\n"
+ "===================================================================\n"
+ "--- linux-4.17-rc7.orig/include/video/udlfb.h\t2018-05-31 14:49:52.000000000 +0200\n"
  "+++ linux-4.17-rc7/include/video/udlfb.h\t2018-05-31 14:49:52.000000000 +0200\n"
  "@@ -56,6 +56,7 @@ struct dlfb_data {\n"
  " \tatomic_t bytes_identical; /* saved effort with backbuffer comparison */\n"
@@ -77,6 +80,11 @@
  "+\tstruct fb_var_screeninfo current_mode;\n"
  " };\n"
  " \n"
-  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
+ " #define NR_USB_REQUEST_I2C_SUB_IO 0x02\n"
+ "\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-d9a368fe82b27e17bfba955ea757fed4d19c4c6dfc81f58ece1106678c64eb0a
+af3de93a18f82b2e7063d1bab39fe45164fe1aa8957ebf9db03faa0ccfc5b266
