diff for duplicates of <20190520082216.26273-19-daniel.vetter@ffwll.ch>
diff --git a/a/1.txt b/N1/1.txt
index cc9e29e..2739c5f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -66,7 +66,7 @@ index 156523cc48bf..032506576aa0 100644
+ fb_info->fix.id,
+ fb_is_primary_device(fb_info));
- if (num_registered_fb == FB_MAX)
+ if (num_registered_fb = FB_MAX)
return -ENXIO;
@@ -1706,32 +1700,25 @@ static int do_register_framebuffer(struct fb_info *fb_info)
return ret;
diff --git a/a/content_digest b/N1/content_digest
index 4c4cc2e..670d52a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,22 +8,21 @@
"Subject\0[PATCH 18/33] fbdev: make unregister/unlink functions not fail\0"
]
[
- "Date\0Mon, 20 May 2019 10:22:01 +0200\0"
+ "Date\0Mon, 20 May 2019 08:22:01 +0000\0"
]
[
"To\0DRI Development <dri-devel\@lists.freedesktop.org>\0"
]
[
- "Cc\0Intel Graphics Development <intel-gfx\@lists.freedesktop.org>",
- " LKML <linux-kernel\@vger.kernel.org>",
- " Daniel Vetter <daniel.vetter\@ffwll.ch>",
- " Daniel Vetter <daniel.vetter\@intel.com>",
+ "Cc\0linux-fbdev\@vger.kernel.org",
" Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
+ " Daniel Vetter <daniel.vetter\@ffwll.ch>",
+ " Intel Graphics Development <intel-gfx\@lists.freedesktop.org>",
+ " LKML <linux-kernel\@vger.kernel.org>",
" Micha\305\202 Miros\305\202aw <mirq-linux\@rere.qmqm.pl>",
- " Peter Rosin <peda\@axentia.se>",
- " Hans de Goede <hdegoede\@redhat.com>",
" Mikulas Patocka <mpatocka\@redhat.com>",
- " linux-fbdev\@vger.kernel.org\0"
+ " Daniel Vetter <daniel.vetter\@intel.com>",
+ " Peter Rosin <peda\@axentia.se>\0"
]
[
"\0000:1\0"
@@ -100,7 +99,7 @@
"+\t\t\t\t\t fb_info->fix.id,\n",
"+\t\t\t\t\t fb_is_primary_device(fb_info));\n",
" \n",
- " \tif (num_registered_fb == FB_MAX)\n",
+ " \tif (num_registered_fb = FB_MAX)\n",
" \t\treturn -ENXIO;\n",
"\@\@ -1706,32 +1700,25 \@\@ static int do_register_framebuffer(struct fb_info *fb_info)\n",
" \treturn ret;\n",
@@ -245,4 +244,4 @@
"2.20.1"
]
-755caa987f54316a01b3b845b0f2e3f456c51267952603a12f4db47b439c0dae
+b7192d1af639e59698cf8c097da41d9af47f23164d42be1116e038f8b7640688
diff --git a/a/1.txt b/N2/1.txt
index cc9e29e..45469ff 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -208,4 +208,9 @@ index 38fae1678939..44021e55b15c 100644
const char *name);
extern int remove_conflicting_framebuffers(struct apertures_struct *a,
--
-2.20.1
\ No newline at end of file
+2.20.1
+
+_______________________________________________
+Intel-gfx mailing list
+Intel-gfx@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/intel-gfx
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 4c4cc2e..6a2d780 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -14,16 +14,15 @@
"To\0DRI Development <dri-devel\@lists.freedesktop.org>\0"
]
[
- "Cc\0Intel Graphics Development <intel-gfx\@lists.freedesktop.org>",
- " LKML <linux-kernel\@vger.kernel.org>",
- " Daniel Vetter <daniel.vetter\@ffwll.ch>",
- " Daniel Vetter <daniel.vetter\@intel.com>",
+ "Cc\0linux-fbdev\@vger.kernel.org",
" Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
+ " Daniel Vetter <daniel.vetter\@ffwll.ch>",
+ " Intel Graphics Development <intel-gfx\@lists.freedesktop.org>",
+ " LKML <linux-kernel\@vger.kernel.org>",
" Micha\305\202 Miros\305\202aw <mirq-linux\@rere.qmqm.pl>",
- " Peter Rosin <peda\@axentia.se>",
- " Hans de Goede <hdegoede\@redhat.com>",
" Mikulas Patocka <mpatocka\@redhat.com>",
- " linux-fbdev\@vger.kernel.org\0"
+ " Daniel Vetter <daniel.vetter\@intel.com>",
+ " Peter Rosin <peda\@axentia.se>\0"
]
[
"\0000:1\0"
@@ -242,7 +241,12 @@
" \t\t\t\t\t const char *name);\n",
" extern int remove_conflicting_framebuffers(struct apertures_struct *a,\n",
"-- \n",
- "2.20.1"
+ "2.20.1\n",
+ "\n",
+ "_______________________________________________\n",
+ "Intel-gfx mailing list\n",
+ "Intel-gfx\@lists.freedesktop.org\n",
+ "https://lists.freedesktop.org/mailman/listinfo/intel-gfx"
]
-755caa987f54316a01b3b845b0f2e3f456c51267952603a12f4db47b439c0dae
+c2642dd5db16250f1278ca7330579dd80638513b36a0597d020b6e04a3bc30b8
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.