All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <20200429192840.GA1022@ravnborg.org>

diff --git a/a/1.txt b/N1/1.txt
index 4702e89..e4cec5e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -35,7 +35,8 @@ If my prodding of Christoph will result in anything only time will tell.
 >  1 file changed, 1 insertion(+), 1 deletion(-)
 > 
 > Index: b/drivers/video/fbdev/controlfb.c
-> =================================> --- a/drivers/video/fbdev/controlfb.c
+> ===================================================================
+> --- a/drivers/video/fbdev/controlfb.c
 > +++ b/drivers/video/fbdev/controlfb.c
 > @@ -55,7 +55,7 @@
 >  #include "macmodes.h"
@@ -46,3 +47,7 @@ If my prodding of Christoph will result in anything only time will tell.
 >  #define invalid_vram_cache(addr)
 >  #undef in_8
 >  #undef out_8
+_______________________________________________
+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 9e73496..72c1211 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
  "ref\0fe520316-3863-e6c4-9581-5d709f49e906@samsung.com\0"
  "From\0Sam Ravnborg <sam@ravnborg.org>\0"
  "Subject\0Re: [PATCH v2] video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y && PPC32=n\0"
- "Date\0Wed, 29 Apr 2020 19:28:40 +0000\0"
+ "Date\0Wed, 29 Apr 2020 21:28:40 +0200\0"
  "To\0Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>\0"
  "Cc\0Stephen Rothwell <sfr@canb.auug.org.au>"
   linux-fbdev@vger.kernel.org
@@ -49,7 +49,8 @@
  ">  1 file changed, 1 insertion(+), 1 deletion(-)\n"
  "> \n"
  "> Index: b/drivers/video/fbdev/controlfb.c\n"
- "> =================================> --- a/drivers/video/fbdev/controlfb.c\n"
+ "> ===================================================================\n"
+ "> --- a/drivers/video/fbdev/controlfb.c\n"
  "> +++ b/drivers/video/fbdev/controlfb.c\n"
  "> @@ -55,7 +55,7 @@\n"
  ">  #include \"macmodes.h\"\n"
@@ -59,6 +60,10 @@
  "> +#if !defined(CONFIG_PPC_PMAC) || !defined(CONFIG_PPC32)\n"
  ">  #define invalid_vram_cache(addr)\n"
  ">  #undef in_8\n"
- >  #undef out_8
+ ">  #undef out_8\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-0beef8637553da76f390617a8ec9ab286a3aa62fb111c6fbe14623e784468090
+1b20f9b0f70796c3ea2044a23baf5ae4c84ed023795e6c33d22fcd993b2ac0dc

diff --git a/a/1.txt b/N2/1.txt
index 4702e89..ff8a250 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -35,7 +35,8 @@ If my prodding of Christoph will result in anything only time will tell.
 >  1 file changed, 1 insertion(+), 1 deletion(-)
 > 
 > Index: b/drivers/video/fbdev/controlfb.c
-> =================================> --- a/drivers/video/fbdev/controlfb.c
+> ===================================================================
+> --- a/drivers/video/fbdev/controlfb.c
 > +++ b/drivers/video/fbdev/controlfb.c
 > @@ -55,7 +55,7 @@
 >  #include "macmodes.h"
diff --git a/a/content_digest b/N2/content_digest
index 9e73496..20ef23d 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,14 +2,14 @@
  "ref\0fe520316-3863-e6c4-9581-5d709f49e906@samsung.com\0"
  "From\0Sam Ravnborg <sam@ravnborg.org>\0"
  "Subject\0Re: [PATCH v2] video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y && PPC32=n\0"
- "Date\0Wed, 29 Apr 2020 19:28:40 +0000\0"
+ "Date\0Wed, 29 Apr 2020 21:28:40 +0200\0"
  "To\0Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>\0"
  "Cc\0Stephen Rothwell <sfr@canb.auug.org.au>"
-  linux-fbdev@vger.kernel.org
   kbuild test robot <lkp@intel.com>
   Daniel Vetter <daniel.vetter@ffwll.ch>
-  linux-kernel@vger.kernel.org
- " dri-devel@lists.freedesktop.org\0"
+  linux-fbdev@vger.kernel.org
+  dri-devel@lists.freedesktop.org
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "Hi Bartlomiej\n"
@@ -49,7 +49,8 @@
  ">  1 file changed, 1 insertion(+), 1 deletion(-)\n"
  "> \n"
  "> Index: b/drivers/video/fbdev/controlfb.c\n"
- "> =================================> --- a/drivers/video/fbdev/controlfb.c\n"
+ "> ===================================================================\n"
+ "> --- a/drivers/video/fbdev/controlfb.c\n"
  "> +++ b/drivers/video/fbdev/controlfb.c\n"
  "> @@ -55,7 +55,7 @@\n"
  ">  #include \"macmodes.h\"\n"
@@ -61,4 +62,4 @@
  ">  #undef in_8\n"
  >  #undef out_8
 
-0beef8637553da76f390617a8ec9ab286a3aa62fb111c6fbe14623e784468090
+c25ea98c8bc59cc2fb602770ccbadfd0980ff375db13586718a2552c77a632b7

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.