diff for duplicates of <56DDBB18.6030505@intel.com> diff --git a/a/1.txt b/N1/1.txt index 1abd887..150745a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,6 +13,6 @@ On 03/02/2016 12:39 PM, Khalid Aziz wrote: FYI, this will conflict with code in -tip right now: -> http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=mm/pkeys&id=cd0ea35ff5511cde299a61c21a95889b4a71464e +> http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=mm/pkeys&idÍ0ea35ff5511cde299a61c21a95889b4a71464e It's not a big deal to resolve, of course. diff --git a/a/content_digest b/N1/content_digest index bcca6fa..f0a0bd8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01456951177-23579-1-git-send-email-khalid.aziz@oracle.com\0" "From\0Dave Hansen <dave.hansen@intel.com>\0" "Subject\0Re: [PATCH v2] sparc64: Add support for Application Data Integrity (ADI)\0" - "Date\0Mon, 7 Mar 2016 09:32:08 -0800\0" + "Date\0Mon, 07 Mar 2016 17:32:08 +0000\0" "To\0Khalid Aziz <khalid.aziz@oracle.com>" davem@davemloft.net corbet@lwn.net @@ -53,8 +53,8 @@ "\n" "FYI, this will conflict with code in -tip right now:\n" "\n" - "> http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=mm/pkeys&id=cd0ea35ff5511cde299a61c21a95889b4a71464e\n" + "> http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=mm/pkeys&id\303\2150ea35ff5511cde299a61c21a95889b4a71464e\n" "\n" It's not a big deal to resolve, of course. -52f94fc0eaf8e4d33f134e3581a4bb93f70d0ff4385a662f7516ee39cd77db26 +a7063926a198f2de9c23c5a2f108e72e6ed675bbaeba59d42809944a9e5fa08d
diff --git a/a/1.txt b/N2/1.txt index 1abd887..79695b9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,3 +16,9 @@ FYI, this will conflict with code in -tip right now: > http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=mm/pkeys&id=cd0ea35ff5511cde299a61c21a95889b4a71464e It's not a big deal to resolve, of course. + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index bcca6fa..9cb2922 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -55,6 +55,12 @@ "\n" "> http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=mm/pkeys&id=cd0ea35ff5511cde299a61c21a95889b4a71464e\n" "\n" - It's not a big deal to resolve, of course. + "It's not a big deal to resolve, of course.\n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -52f94fc0eaf8e4d33f134e3581a4bb93f70d0ff4385a662f7516ee39cd77db26 +c22da5929248e00f93fb4cc4bd79ace1c85d6994c11ceed6f75f4cc736435c8c
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.