diff for duplicates of <ef584ecd8642e8b1a04f28d6d9c1864b5aa507bb.1535656077.git.mirq-linux@rere.qmqm.pl>
diff --git a/a/1.txt b/N1/1.txt
index b4ed031..d07f173 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,7 +11,7 @@ index f741ba8df01b..30a18d4c9de4 100644
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1618,8 +1618,8 @@ static int do_remove_conflicting_framebuffers(struct apertures_struct *a,
(primary && gen_aper && gen_aper->count &&
- gen_aper->ranges[0].base == VGA_FB_PHYS)) {
+ gen_aper->ranges[0].base = VGA_FB_PHYS)) {
- printk(KERN_INFO "fb: switching to %s from %s\n",
- name, registered_fb[i]->fix.id);
@@ -21,10 +21,4 @@ index f741ba8df01b..30a18d4c9de4 100644
if (ret)
return ret;
--
-2.18.0
-
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
\ No newline at end of file
+2.18.0
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 18fa8fe..03a04fa 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v2 01/12] fbdev: show fbdev number for debugging\0"
]
[
- "Date\0Thu, 30 Aug 2018 23:00:05 +0200\0"
+ "Date\0Thu, 30 Aug 2018 21:00:05 +0000\0"
]
[
"To\0dri-devel\@lists.freedesktop.org\0"
@@ -47,7 +47,7 @@
"+++ b/drivers/video/fbdev/core/fbmem.c\n",
"\@\@ -1618,8 +1618,8 \@\@ static int do_remove_conflicting_framebuffers(struct apertures_struct *a,\n",
" \t\t\t(primary && gen_aper && gen_aper->count &&\n",
- " \t\t\t gen_aper->ranges[0].base == VGA_FB_PHYS)) {\n",
+ " \t\t\t gen_aper->ranges[0].base = VGA_FB_PHYS)) {\n",
" \n",
"-\t\t\tprintk(KERN_INFO \"fb: switching to %s from %s\\n\",\n",
"-\t\t\t name, registered_fb[i]->fix.id);\n",
@@ -57,13 +57,7 @@
" \t\t\tif (ret)\n",
" \t\t\t\treturn ret;\n",
"-- \n",
- "2.18.0\n",
- "\n",
- "\n",
- "_______________________________________________\n",
- "linux-arm-kernel mailing list\n",
- "linux-arm-kernel\@lists.infradead.org\n",
- "http://lists.infradead.org/mailman/listinfo/linux-arm-kernel"
+ "2.18.0"
]
-c1610463ce542a52f6a3c4d8e7a94197c23f0d1bd34a084c3273335eea5e6774
+b5a140355f8bc6722d6be7e86fa6971fb06788d47ab7a32928147c24c62c66fc
diff --git a/a/1.txt b/N2/1.txt
index b4ed031..e5d6881 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,4 +1,4 @@
-Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
+Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
@@ -21,10 +21,4 @@ index f741ba8df01b..30a18d4c9de4 100644
if (ret)
return ret;
--
-2.18.0
-
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
\ No newline at end of file
+2.18.0
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 18fa8fe..1d6a03b 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0cover.1535656077.git.mirq-linux\@rere.qmqm.pl\0"
]
[
- "From\0Micha\305\202 Miros\305\202aw <mirq-linux\@rere.qmqm.pl>\0"
+ "From\0mirq-linux\@rere.qmqm.pl (Micha\305\202 Miros\305\202aw)\0"
]
[
"Subject\0[PATCH v2 01/12] fbdev: show fbdev number for debugging\0"
@@ -11,21 +11,7 @@
"Date\0Thu, 30 Aug 2018 23:00:05 +0200\0"
]
[
- "To\0dri-devel\@lists.freedesktop.org\0"
-]
-[
- "Cc\0linux-fbdev\@vger.kernel.org",
- " linux-tegra\@vger.kernel.org",
- " Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>",
- " David Airlie <airlied\@linux.ie>",
- " amd-gfx\@lists.freedesktop.org",
- " virtualization\@lists.linux-foundation.org",
- " Eric Anholt <eric\@anholt.net>",
- " Thierry Reding <thierry.reding\@gmail.com>",
- " Gerd Hoffmann <kraxel\@redhat.com>",
- " Alex Deucher <alexander.deucher\@amd.com>",
- " Maxime Ripard <maxime.ripard\@bootlin.com>",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -34,7 +20,7 @@
"b\0"
]
[
- "Signed-off-by: Micha\305\202 Miros\305\202aw <mirq-linux\@rere.qmqm.pl>\n",
+ "Signed-off-by: Micha? Miros?aw <mirq-linux\@rere.qmqm.pl>\n",
"Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie\@samsung.com>\n",
"Acked-by: Daniel Vetter <daniel.vetter\@ffwll.ch>\n",
"---\n",
@@ -57,13 +43,7 @@
" \t\t\tif (ret)\n",
" \t\t\t\treturn ret;\n",
"-- \n",
- "2.18.0\n",
- "\n",
- "\n",
- "_______________________________________________\n",
- "linux-arm-kernel mailing list\n",
- "linux-arm-kernel\@lists.infradead.org\n",
- "http://lists.infradead.org/mailman/listinfo/linux-arm-kernel"
+ "2.18.0"
]
-c1610463ce542a52f6a3c4d8e7a94197c23f0d1bd34a084c3273335eea5e6774
+70c9ee58bd801c56acd281b34a7363b357d72ff72508c5191dddaac546462c33
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.