diff for duplicates of <20180603144224.059013384@twibright.com>

diff --git a/a/1.txt b/N1/1.txt
index 7e98a43..3b32e62 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,7 +14,8 @@ Cc: stable@vger.kernel.org
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 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:33.000000000 +0200
+===================================================================
+--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c	2018-06-03 13:17:33.000000000 +0200
 +++ linux-4.17-rc7/drivers/video/fbdev/udlfb.c	2018-06-03 13:17:33.000000000 +0200
 @@ -1665,7 +1665,8 @@ static void dlfb_init_framebuffer_work(s
  	dlfb->info = info;
@@ -27,7 +28,8 @@ Index: linux-4.17-rc7/drivers/video/fbdev/udlfb.c
  	retval = fb_alloc_cmap(&info->cmap, 256, 0);
  	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:33.000000000 +0200
+===================================================================
+--- linux-4.17-rc7.orig/include/video/udlfb.h	2018-06-03 13:17:33.000000000 +0200
 +++ linux-4.17-rc7/include/video/udlfb.h	2018-06-03 13:17:33.000000000 +0200
 @@ -51,6 +51,7 @@ struct dlfb_data {
  	int base8;
@@ -37,3 +39,8 @@ Index: linux-4.17-rc7/include/video/udlfb.h
  	/* blit-only rendering path metrics, exposed through sysfs */
  	atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
  	atomic_t bytes_identical; /* saved effort with backbuffer comparison */
+
+_______________________________________________
+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 d95c0fa..05ace46 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 14/21] udlfb: make a local copy of fb_ops\0"
- "Date\0Sun, 03 Jun 2018 14:41:07 +0000\0"
+ "Date\0Sun, 03 Jun 2018 16:41:07 +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-copy-fbops.patch\0"
  "b\0"
  "The defio subsystem overwrites the method fb_osp->mmap. That method is\n"
  "stored in module's static data - and that means that if we have multiple\n"
@@ -27,7 +28,8 @@
  " 2 files changed, 3 insertions(+), 1 deletion(-)\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:33.000000000 +0200\n"
+ "===================================================================\n"
+ "--- linux-4.17-rc7.orig/drivers/video/fbdev/udlfb.c\t2018-06-03 13:17:33.000000000 +0200\n"
  "+++ linux-4.17-rc7/drivers/video/fbdev/udlfb.c\t2018-06-03 13:17:33.000000000 +0200\n"
  "@@ -1665,7 +1665,8 @@ static void dlfb_init_framebuffer_work(s\n"
  " \tdlfb->info = info;\n"
@@ -40,7 +42,8 @@
  " \tretval = fb_alloc_cmap(&info->cmap, 256, 0);\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:33.000000000 +0200\n"
+ "===================================================================\n"
+ "--- linux-4.17-rc7.orig/include/video/udlfb.h\t2018-06-03 13:17:33.000000000 +0200\n"
  "+++ linux-4.17-rc7/include/video/udlfb.h\t2018-06-03 13:17:33.000000000 +0200\n"
  "@@ -51,6 +51,7 @@ struct dlfb_data {\n"
  " \tint base8;\n"
@@ -49,6 +52,11 @@
  "+\tstruct fb_ops ops;\n"
  " \t/* blit-only rendering path metrics, exposed through sysfs */\n"
  " \tatomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */\n"
- " \tatomic_t bytes_identical; /* saved effort with backbuffer comparison */"
+ " \tatomic_t bytes_identical; /* saved effort with backbuffer comparison */\n"
+ "\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-821a804ca922f368189bb2719efd2c92afdcddd550f1ff5ed78427e3937e0863
+6e14cd560e3fa78b38caec3e2b11a4f0da317ec8093e7fec19a63ef0900e757a
