diff for duplicates of <1547567689.4156.291.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 3e05954..45bc770 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ On Tue, 2019-01-15 at 23:47 +0800, Kairui Song wrote: > > > } > > > > > > +#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING -> > > + if (id == INTEGRITY_KEYRING_PLATFORM) { +> > > + if (id = INTEGRITY_KEYRING_PLATFORM) { > > > + set_platform_trusted_keys(keyring[id]); > > > + } > > > +#endif @@ -35,9 +35,3 @@ On Tue, 2019-01-15 at 23:47 +0800, Kairui Song wrote: Right, that's a really good reason. Mimi - - -_______________________________________________ -kexec mailing list -kexec@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/kexec diff --git a/a/content_digest b/N1/content_digest index fe89e70..568ed22 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,21 +4,21 @@ "ref\0CACPcB9fQUNiD8UEVDa+bU67PZSOkckwhwD00Qvu4m3G0JmqqHQ@mail.gmail.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [RFC PATCH v2 1/2] integrity, KEYS: add a reference to platform keyring\0" - "Date\0Tue, 15 Jan 2019 10:54:49 -0500\0" + "Date\0Tue, 15 Jan 2019 15:54:49 +0000\0" "To\0Kairui Song <kasong@redhat.com>\0" - "Cc\0jwboyer@fedoraproject.org" - Eric Biggers <ebiggers@google.com> - Dave Young <dyoung@redhat.com> - nayna@linux.ibm.com - kexec@lists.infradead.org - linux-kernel@vger.kernel.org - jmorris@namei.org + "Cc\0linux-kernel@vger.kernel.org" David Howells <dhowells@redhat.com> - keyrings@vger.kernel.org - linux-integrity <linux-integrity@vger.kernel.org> David Woodhouse <dwmw2@infradead.org> + jwboyer@fedoraproject.org + keyrings@vger.kernel.org + jmorris@namei.org + serge@hallyn.com bauerman@linux.ibm.com - " serge@hallyn.com\0" + Eric Biggers <ebiggers@google.com> + nayna@linux.ibm.com + Dave Young <dyoung@redhat.com> + linux-integrity <linux-integrity@vger.kernel.org> + " kexec@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2019-01-15 at 23:47 +0800, Kairui Song wrote:\n" @@ -36,7 +36,7 @@ "> > > }\n" "> > >\n" "> > > +#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING\n" - "> > > + if (id == INTEGRITY_KEYRING_PLATFORM) {\n" + "> > > + if (id = INTEGRITY_KEYRING_PLATFORM) {\n" "> > > + set_platform_trusted_keys(keyring[id]);\n" "> > > + }\n" "> > > +#endif\n" @@ -57,12 +57,6 @@ "\n" "Right, that's a really good reason.\n" "\n" - "Mimi\n" - "\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + Mimi -c9e4935d1e27f9fc332d09ac25c4b1d5c6accc39dfe1d29da2ac379b16df31ab +ec43810a7908fa27cf3aa4ae793ee551c714b0f26853cc972071789d9554b07b
diff --git a/a/1.txt b/N2/1.txt index 3e05954..d51883b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -35,9 +35,3 @@ On Tue, 2019-01-15 at 23:47 +0800, Kairui Song wrote: Right, that's a really good reason. Mimi - - -_______________________________________________ -kexec mailing list -kexec@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/kexec diff --git a/a/content_digest b/N2/content_digest index fe89e70..cc5cc5e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,19 +6,19 @@ "Subject\0Re: [RFC PATCH v2 1/2] integrity, KEYS: add a reference to platform keyring\0" "Date\0Tue, 15 Jan 2019 10:54:49 -0500\0" "To\0Kairui Song <kasong@redhat.com>\0" - "Cc\0jwboyer@fedoraproject.org" - Eric Biggers <ebiggers@google.com> - Dave Young <dyoung@redhat.com> - nayna@linux.ibm.com - kexec@lists.infradead.org - linux-kernel@vger.kernel.org - jmorris@namei.org + "Cc\0linux-kernel@vger.kernel.org" David Howells <dhowells@redhat.com> - keyrings@vger.kernel.org - linux-integrity <linux-integrity@vger.kernel.org> David Woodhouse <dwmw2@infradead.org> + jwboyer@fedoraproject.org + keyrings@vger.kernel.org + jmorris@namei.org + serge@hallyn.com bauerman@linux.ibm.com - " serge@hallyn.com\0" + Eric Biggers <ebiggers@google.com> + nayna@linux.ibm.com + Dave Young <dyoung@redhat.com> + linux-integrity <linux-integrity@vger.kernel.org> + " kexec@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2019-01-15 at 23:47 +0800, Kairui Song wrote:\n" @@ -57,12 +57,6 @@ "\n" "Right, that's a really good reason.\n" "\n" - "Mimi\n" - "\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + Mimi -c9e4935d1e27f9fc332d09ac25c4b1d5c6accc39dfe1d29da2ac379b16df31ab +05dffc82d3c887b9c91e4c8174cfc6d1bb8ed31d079b9e8bb853b2e14a382dca
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.