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

diff for duplicates of <20210727111448.1443-1-broonie@kernel.org>

diff --git a/a/content_digest b/N1/content_digest
index 775ceaa..6dd4d80 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -13,9 +13,8 @@
   " DRI <dri-devel\@lists.freedesktop.org>\0"
 ]
 [
-  "Cc\0Linux Kernel Mailing List <linux-kernel\@vger.kernel.org>",
-  " Linux Next Mailing List <linux-next\@vger.kernel.org>",
-  " Zack Rusin <zackr\@vmware.com>\0"
+  "Cc\0Linux Next Mailing List <linux-next\@vger.kernel.org>",
+  " Linux Kernel Mailing List <linux-kernel\@vger.kernel.org>\0"
 ]
 [
   "\0000:1\0"
@@ -53,4 +52,4 @@
   "+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h"
 ]
 
-fb6198070081eaef29f3faf989b7f3a6606f5ea4240f57f9b92bd32da114e833
+f53c06202a33d1a7f4bd643580997965092ae7a90bab368f7316a86d6e11bc5b

diff --git a/a/1.txt b/N2/1.txt
index ef2eba6..32260b7 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -24,4 +24,8 @@ complex conflicts.
 diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
 index 356f82c26f59,5652d982b1ce..000000000000
 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
-+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
\ No newline at end of file
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+_______________________________________________
+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 775ceaa..5ee7281 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
   "From\0Mark Brown <broonie\@kernel.org>\0"
 ]
 [
-  "Subject\0linux-next: manual merge of the drm-misc tree with the drm-next tree\0"
+  "Subject\0[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-next tree\0"
 ]
 [
   "Date\0Tue, 27 Jul 2021 12:14:47 +0100\0"
@@ -13,8 +13,8 @@
   " DRI <dri-devel\@lists.freedesktop.org>\0"
 ]
 [
-  "Cc\0Linux Kernel Mailing List <linux-kernel\@vger.kernel.org>",
-  " Linux Next Mailing List <linux-next\@vger.kernel.org>",
+  "Cc\0Linux Next Mailing List <linux-next\@vger.kernel.org>",
+  " Linux Kernel Mailing List <linux-kernel\@vger.kernel.org>",
   " Zack Rusin <zackr\@vmware.com>\0"
 ]
 [
@@ -50,7 +50,11 @@
   "diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h\n",
   "index 356f82c26f59,5652d982b1ce..000000000000\n",
   "--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h\n",
-  "+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h"
+  "+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h\n",
+  "_______________________________________________\n",
+  "Intel-gfx mailing list\n",
+  "Intel-gfx\@lists.freedesktop.org\n",
+  "https://lists.freedesktop.org/mailman/listinfo/intel-gfx"
 ]
 
-fb6198070081eaef29f3faf989b7f3a6606f5ea4240f57f9b92bd32da114e833
+e6d4134f585e6694b248711bbc1241fe49acf3e25428eda7bfcc5e53cc1dd185
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.