diff for duplicates of <20170707003421.GC10672@ZenIV.linux.org.uk> diff --git a/a/1.txt b/N1/1.txt index b1bc299..6a8aee5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ On Fri, Jul 07, 2017 at 12:22:38AM +0000, Williams, Dan J wrote: > All of the commits in this pull request have appeared in one or more > -next releases with no errors reported, however, Stephen did report a > late merge conflict between nvdimm.git and the vfs.git tree. Stephen's -> merge resolution is here:�http://marc.info/?l=linux-kernel&m=1499064115 +> merge resolution is here: http://marc.info/?l=linux-kernel&m=1499064115 > 07301&w=2, but to match Al's changes we appear to also need the > incremental change below. > @@ -24,3 +24,7 @@ On Fri, Jul 07, 2017 at 12:22:38AM +0000, Williams, Dan J wrote: > operations" at the end of this message for reference. There will be some followup, but let's do that on top of your branch. +_______________________________________________ +Linux-nvdimm mailing list +Linux-nvdimm@lists.01.org +https://lists.01.org/mailman/listinfo/linux-nvdimm diff --git a/a/content_digest b/N1/content_digest index e14253f..9d272cf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,12 +4,12 @@ "Date\0Fri, 7 Jul 2017 01:34:21 +0100\0" "To\0Williams" " Dan J <dan.j.williams@intel.com>\0" - "Cc\0torvalds@linux-foundation.org <torvalds@linux-foundation.org>" + "Cc\0linux-nvdimm@lists.01.org <linux-nvdimm@lists.01.org>" + x86@kernel.org <x86@kernel.org> linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - linux-nvdimm@lists.01.org <linux-nvdimm@lists.01.org> linux-block@vger.kernel.org <linux-block@vger.kernel.org> - x86@kernel.org <x86@kernel.org> - " linux-fsdevel@vger.kernel.org <linux-fsdevel@vger.kernel.org>\0" + linux-fsdevel@vger.kernel.org <linux-fsdevel@vger.kernel.org> + " torvalds@linux-foundation.org <torvalds@linux-foundation.org>\0" "\00:1\0" "b\0" "On Fri, Jul 07, 2017 at 12:22:38AM +0000, Williams, Dan J wrote:\n" @@ -28,7 +28,7 @@ "> All of the commits in this pull request have appeared in one or more\n" "> -next releases with no errors reported, however, Stephen did report a\n" "> late merge conflict between nvdimm.git and the vfs.git tree. Stephen's\n" - "> merge resolution is here:\303\257\302\277\302\275http://marc.info/?l=linux-kernel&m=1499064115\n" + "> merge resolution is here:\302\240http://marc.info/?l=linux-kernel&m=1499064115\n" "> 07301&w=2, but to match Al's changes we appear to also need the\n" "> incremental change below.\n" "> \n" @@ -37,6 +37,10 @@ "> uaccess: introduce copy_from_iter_flushcache for pmem / cache-bypass\n" "> operations\" at the end of this message for reference.\n" "\n" - There will be some followup, but let's do that on top of your branch. + "There will be some followup, but let's do that on top of your branch.\n" + "_______________________________________________\n" + "Linux-nvdimm mailing list\n" + "Linux-nvdimm@lists.01.org\n" + https://lists.01.org/mailman/listinfo/linux-nvdimm -99dd7c0ac11f75fb16c72607f4f0bdc2d7095c9c5b0d850331a661351c1fd86b +905e494c5e62929b7b55a922dde826418b582b260cb6a3ece23a9b54a738918c
diff --git a/a/1.txt b/N2/1.txt index b1bc299..7b0514a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -14,7 +14,7 @@ On Fri, Jul 07, 2017 at 12:22:38AM +0000, Williams, Dan J wrote: > All of the commits in this pull request have appeared in one or more > -next releases with no errors reported, however, Stephen did report a > late merge conflict between nvdimm.git and the vfs.git tree. Stephen's -> merge resolution is here:�http://marc.info/?l=linux-kernel&m=1499064115 +> merge resolution is here: http://marc.info/?l=linux-kernel&m=1499064115 > 07301&w=2, but to match Al's changes we appear to also need the > incremental change below. > diff --git a/a/content_digest b/N2/content_digest index e14253f..d56e4b6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -28,7 +28,7 @@ "> All of the commits in this pull request have appeared in one or more\n" "> -next releases with no errors reported, however, Stephen did report a\n" "> late merge conflict between nvdimm.git and the vfs.git tree. Stephen's\n" - "> merge resolution is here:\303\257\302\277\302\275http://marc.info/?l=linux-kernel&m=1499064115\n" + "> merge resolution is here:\302\240http://marc.info/?l=linux-kernel&m=1499064115\n" "> 07301&w=2, but to match Al's changes we appear to also need the\n" "> incremental change below.\n" "> \n" @@ -39,4 +39,4 @@ "\n" There will be some followup, but let's do that on top of your branch. -99dd7c0ac11f75fb16c72607f4f0bdc2d7095c9c5b0d850331a661351c1fd86b +3475839212367e94432edb36589d2b5700c1e86dfca5819dd012388d2bb6a09d
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.