diff for duplicates of <1548171438.4038.2.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index d051510..b107732 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -72,14 +72,8 @@ Reviewed/Tested-by: Mimi Zohar <zohar@linux.ibm.com> > keyring_name[id], err); > keyring[id] = NULL; > + } else { -> + if (id == INTEGRITY_KEYRING_PLATFORM) +> + if (id = INTEGRITY_KEYRING_PLATFORM) > + set_platform_trusted_keys(keyring[id]); > } > > return err; - - -_______________________________________________ -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 5b48f79..6536026 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,21 +2,21 @@ "ref\020190121095929.26915-2-kasong@redhat.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [PATCH v5 1/2] integrity, KEYS: add a reference to platform keyring\0" - "Date\0Tue, 22 Jan 2019 10:37:18 -0500\0" + "Date\0Tue, 22 Jan 2019 15:37:18 +0000\0" "To\0Kairui Song <kasong@redhat.com>" " linux-kernel@vger.kernel.org\0" - "Cc\0jwboyer@fedoraproject.org" + "Cc\0dhowells@redhat.com" + dwmw2@infradead.org + jwboyer@fedoraproject.org + keyrings@vger.kernel.org + jmorris@namei.org + serge@hallyn.com + bauerman@linux.ibm.com ebiggers@google.com - dyoung@redhat.com nayna@linux.ibm.com - kexec@lists.infradead.org - jmorris@namei.org - dhowells@redhat.com - keyrings@vger.kernel.org + dyoung@redhat.com linux-integrity@vger.kernel.org - dwmw2@infradead.org - bauerman@linux.ibm.com - " serge@hallyn.com\0" + " kexec@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, 2019-01-21 at 17:59 +0800, Kairui Song wrote:\n" @@ -93,16 +93,10 @@ "> \t\t\tkeyring_name[id], err);\n" "> \t\tkeyring[id] = NULL;\n" "> +\t} else {\n" - "> +\t\tif (id == INTEGRITY_KEYRING_PLATFORM)\n" + "> +\t\tif (id = INTEGRITY_KEYRING_PLATFORM)\n" "> +\t\t\tset_platform_trusted_keys(keyring[id]);\n" "> \t}\n" "> \n" - "> \treturn err;\n" - "\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + "> \treturn err;" -04d514d234db4ca72c7e99db74f45266fa5feda9b4a5cd6e16af348d0a754653 +e8dbb798538c9e6090c2813bc98953efd082d81e789666e0be017fb6b4954e28
diff --git a/a/1.txt b/N2/1.txt index d051510..fb8ecfb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -77,9 +77,3 @@ Reviewed/Tested-by: Mimi Zohar <zohar@linux.ibm.com> > } > > return err; - - -_______________________________________________ -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 5b48f79..a96e342 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,18 +5,18 @@ "Date\0Tue, 22 Jan 2019 10:37:18 -0500\0" "To\0Kairui Song <kasong@redhat.com>" " linux-kernel@vger.kernel.org\0" - "Cc\0jwboyer@fedoraproject.org" + "Cc\0dhowells@redhat.com" + dwmw2@infradead.org + jwboyer@fedoraproject.org + keyrings@vger.kernel.org + jmorris@namei.org + serge@hallyn.com + bauerman@linux.ibm.com ebiggers@google.com - dyoung@redhat.com nayna@linux.ibm.com - kexec@lists.infradead.org - jmorris@namei.org - dhowells@redhat.com - keyrings@vger.kernel.org + dyoung@redhat.com linux-integrity@vger.kernel.org - dwmw2@infradead.org - bauerman@linux.ibm.com - " serge@hallyn.com\0" + " kexec@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, 2019-01-21 at 17:59 +0800, Kairui Song wrote:\n" @@ -97,12 +97,6 @@ "> +\t\t\tset_platform_trusted_keys(keyring[id]);\n" "> \t}\n" "> \n" - "> \treturn err;\n" - "\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + "> \treturn err;" -04d514d234db4ca72c7e99db74f45266fa5feda9b4a5cd6e16af348d0a754653 +ee41cabf076a931752f748ce9a3f7794f8b1759e95030e818cf69885402e2391
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.