diff for duplicates of <alpine.LFD.2.20.1711060221580.3910@localhost> diff --git a/a/1.txt b/N1/1.txt index ddf174b..82e5204 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ On Fri, 3 Nov 2017, Mimi Zohar wrote: > Hi James, > > With all the changes to MAINTAINERS there's a conflict with the patch -> in my next branch. Could you carry this patch? +> in my next branch. ?Could you carry this patch? Applied to: diff --git a/a/content_digest b/N1/content_digest index 62a7fc6..f4fc224 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,8 @@ "ref\01509721716.3416.51.camel@linux.vnet.ibm.com\0" - "From\0James Morris <james.l.morris@oracle.com>\0" - "Subject\0Re: [PATCH] MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries\0" + "From\0james.l.morris@oracle.com (James Morris)\0" + "Subject\0[PATCH] MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries\0" "Date\0Mon, 6 Nov 2017 02:22:10 +1100 (AEDT)\0" - "To\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" - "Cc\0James Morris <jmorris@namei.org>" - linux-security-module <linux-security-module@vger.kernel.org> - " linux-integrity <linux-integrity@vger.kernel.org>\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, 3 Nov 2017, Mimi Zohar wrote:\n" @@ -13,7 +10,7 @@ "> Hi James,\n" "> \n" "> With all the changes to MAINTAINERS there's a conflict with the patch\n" - "> in my next branch. Could you carry this patch?\n" + "> in my next branch. ?Could you carry this patch?\n" "\n" "Applied to:\n" "\n" @@ -24,4 +21,4 @@ "James Morris\n" <james.l.morris@oracle.com> -6cc9c7fde1bef4dce612f33a438ee6464fda88eebe4c525832fe23ede550e0e7 +14de7f827445f6fa2b51f71648aa0ee883484a1a4ad588297997fbedcf715760
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.