diff for duplicates of <1547567689.4156.291.camel@linux.ibm.com>
diff --git a/a/1.txt b/N1/1.txt
index 5f277dc..35c7700 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
diff --git a/a/content_digest b/N1/content_digest
index 1814bb7..2e78ce7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -17,7 +17,7 @@
"Subject\0Re: [RFC PATCH v2 1/2] integrity, KEYS: add a reference to platform keyring\0"
]
[
- "Date\0Tue, 15 Jan 2019 15:54:49 +0000\0"
+ "Date\0Tue, 15 Jan 2019 10:54:49 -0500\0"
]
[
"To\0Kairui Song <kasong\@redhat.com>\0"
@@ -59,7 +59,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",
@@ -83,4 +83,4 @@
"Mimi"
]
-ec43810a7908fa27cf3aa4ae793ee551c714b0f26853cc972071789d9554b07b
+05dffc82d3c887b9c91e4c8174cfc6d1bb8ed31d079b9e8bb853b2e14a382dca
diff --git a/a/1.txt b/N2/1.txt
index 5f277dc..e208e8e 100644
--- a/a/1.txt
+++ b/N2/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
@@ -34,4 +34,10 @@ On Tue, 2019-01-15 at 23:47 +0800, Kairui Song wrote:
Right, that's a really good reason.
-Mimi
\ No newline at end of file
+Mimi
+
+
+_______________________________________________
+kexec mailing list
+kexec@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/kexec
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 1814bb7..551ebe7 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -17,25 +17,25 @@
"Subject\0Re: [RFC PATCH v2 1/2] integrity, KEYS: add a reference to platform keyring\0"
]
[
- "Date\0Tue, 15 Jan 2019 15:54:49 +0000\0"
+ "Date\0Tue, 15 Jan 2019 10:54:49 -0500\0"
]
[
"To\0Kairui Song <kasong\@redhat.com>\0"
]
[
- "Cc\0linux-kernel\@vger.kernel.org",
- " David Howells <dhowells\@redhat.com>",
- " David Woodhouse <dwmw2\@infradead.org>",
- " jwboyer\@fedoraproject.org",
- " keyrings\@vger.kernel.org",
- " jmorris\@namei.org",
- " serge\@hallyn.com",
- " bauerman\@linux.ibm.com",
+ "Cc\0jwboyer\@fedoraproject.org",
" Eric Biggers <ebiggers\@google.com>",
- " nayna\@linux.ibm.com",
" Dave Young <dyoung\@redhat.com>",
+ " nayna\@linux.ibm.com",
+ " kexec\@lists.infradead.org",
+ " linux-kernel\@vger.kernel.org",
+ " jmorris\@namei.org",
+ " David Howells <dhowells\@redhat.com>",
+ " keyrings\@vger.kernel.org",
" linux-integrity <linux-integrity\@vger.kernel.org>",
- " kexec\@lists.infradead.org\0"
+ " David Woodhouse <dwmw2\@infradead.org>",
+ " bauerman\@linux.ibm.com",
+ " serge\@hallyn.com\0"
]
[
"\0000:1\0"
@@ -59,7 +59,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",
@@ -80,7 +80,13 @@
"\n",
"Right, that's a really good reason.\n",
"\n",
- "Mimi"
+ "Mimi\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "kexec mailing list\n",
+ "kexec\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/kexec"
]
-ec43810a7908fa27cf3aa4ae793ee551c714b0f26853cc972071789d9554b07b
+c9e4935d1e27f9fc332d09ac25c4b1d5c6accc39dfe1d29da2ac379b16df31ab
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.