diff for duplicates of <20180603144225.463043082@twibright.com>

diff --git a/a/1.txt b/N1/1.txt
index 85006b2..d6e996c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,7 +16,8 @@ Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
  2 files changed, 48 insertions(+), 23 deletions(-)
 
 Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c
-=================================--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c	2018-06-03 13:17:41.000000000 +0200
+===================================================================
+--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c	2018-06-03 13:17:41.000000000 +0200
 +++ linux-4.17-rc7/drivers/video/fbdev/udlfb.c	2018-06-03 13:17:41.000000000 +0200
 @@ -73,6 +73,13 @@ static bool fb_defio = 1;  /* Detect mma
  static bool shadow = 1; /* Optionally disable shadow framebuffer */
@@ -81,7 +82,7 @@ Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c
 -	info->fix.line_length = info->var.xres * (info->var.bits_per_pixel / 8);
 +	info->fix.line_length = line_length;
  
- 	if (dlfb->fb_count = 0) {
+ 	if (dlfb->fb_count == 0) {
  
 @@ -1066,11 +1080,11 @@ static int dlfb_ops_set_par(struct fb_in
  		pix_framebuffer = (u16 *) info->screen_base;
@@ -204,7 +205,8 @@ Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c
  	retval = register_framebuffer(info);
  	if (retval < 0) {
 Index: linux-4.17-rc7/include/video/udlfb.h
-=================================--- linux-4.17-rc7.orig/include/video/udlfb.h	2018-06-03 13:17:41.000000000 +0200
+===================================================================
+--- linux-4.17-rc7.orig/include/video/udlfb.h	2018-06-03 13:17:41.000000000 +0200
 +++ linux-4.17-rc7/include/video/udlfb.h	2018-06-03 13:17:41.000000000 +0200
 @@ -58,6 +58,7 @@ struct dlfb_data {
  	atomic_t bytes_sent; /* to usb, after compression including overhead */
@@ -214,3 +216,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 b068048..33dfcc8 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 18/21] udlfb: allow reallocating the framebuffer\0"
- "Date\0Sun, 03 Jun 2018 14:41:11 +0000\0"
+ "Date\0Sun, 03 Jun 2018 16:41:11 +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-realloc-framebuffer.patch\0"
  "b\0"
  "This patch changes udlfb so that it may reallocate the framebuffer when\n"
  "setting higher-resolution mode. If we boot the system without monitor\n"
@@ -29,7 +30,8 @@
  " 2 files changed, 48 insertions(+), 23 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-06-03 13:17:41.000000000 +0200\n"
+ "===================================================================\n"
+ "--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c\t2018-06-03 13:17:41.000000000 +0200\n"
  "+++ linux-4.17-rc7/drivers/video/fbdev/udlfb.c\t2018-06-03 13:17:41.000000000 +0200\n"
  "@@ -73,6 +73,13 @@ static bool fb_defio = 1;  /* Detect mma\n"
  " static bool shadow = 1; /* Optionally disable shadow framebuffer */\n"
@@ -94,7 +96,7 @@
  "-\tinfo->fix.line_length = info->var.xres * (info->var.bits_per_pixel / 8);\n"
  "+\tinfo->fix.line_length = line_length;\n"
  " \n"
- " \tif (dlfb->fb_count = 0) {\n"
+ " \tif (dlfb->fb_count == 0) {\n"
  " \n"
  "@@ -1066,11 +1080,11 @@ static int dlfb_ops_set_par(struct fb_in\n"
  " \t\tpix_framebuffer = (u16 *) info->screen_base;\n"
@@ -217,7 +219,8 @@
  " \tretval = register_framebuffer(info);\n"
  " \tif (retval < 0) {\n"
  "Index: linux-4.17-rc7/include/video/udlfb.h\n"
- "=================================--- linux-4.17-rc7.orig/include/video/udlfb.h\t2018-06-03 13:17:41.000000000 +0200\n"
+ "===================================================================\n"
+ "--- linux-4.17-rc7.orig/include/video/udlfb.h\t2018-06-03 13:17:41.000000000 +0200\n"
  "+++ linux-4.17-rc7/include/video/udlfb.h\t2018-06-03 13:17:41.000000000 +0200\n"
  "@@ -58,6 +58,7 @@ struct dlfb_data {\n"
  " \tatomic_t bytes_sent; /* to usb, after compression including overhead */\n"
@@ -226,6 +229,11 @@
  "+\tstruct list_head deferred_free;\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
 
-2fec301d8fe7f84353faf6d5fe259660d119270e84d4fee07fa71981f8cf681f
+478cf195f7376d09ed671fa7794190a9d8f9ed5cbac264174026febbf2bc1668
