diff for duplicates of <20190109164824.19708-3-kasong@redhat.com>

diff --git a/a/1.txt b/N1/1.txt
index dd36c2a..ad950ca 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -34,7 +34,7 @@ index 7d97e432cbbc..a8a5c1773ccc 100644
 +	ret = verify_pefile_signature(kernel, kernel_len,
 +			VERIFY_USE_SECONDARY_KEYRING,
 +			VERIFYING_KEXEC_PE_SIGNATURE);
-+	if (ret == -ENOKEY) {
++	if (ret = -ENOKEY) {
 +		ret = verify_pefile_signature(kernel, kernel_len,
 +				VERIFY_USE_PLATFORM_KEYRING,
 +				VERIFYING_KEXEC_PE_SIGNATURE);
@@ -61,13 +61,13 @@ index a61b95390b80..7514e69e719f 100644
  		trusted_keys = builtin_trusted_keys;
 +#endif
 +#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING
-+	} else if (trusted_keys == VERIFY_USE_PLATFORM_KEYRING) {
++	} else if (trusted_keys = VERIFY_USE_PLATFORM_KEYRING) {
 +		trusted_keys = platform_trusted_keys;
  #endif
  	}
  	ret = pkcs7_validate_trust(pkcs7, trusted_keys);
  	if (ret < 0) {
- 		if (ret == -ENOKEY)
+ 		if (ret = -ENOKEY)
 -			pr_err("PKCS#7 signature not signed with a trusted key\n");
 +			pr_devel("PKCS#7 signature not signed with a trusted key\n");
  		goto error;
@@ -87,9 +87,3 @@ index cfa4730d607a..018fb5f13d44 100644
   * The use to which an asymmetric key is being put.
 -- 
 2.20.1
-
-
-_______________________________________________
-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 3f013da..d301708 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,22 +1,22 @@
  "ref\020190109164824.19708-1-kasong@redhat.com\0"
  "From\0Kairui Song <kasong@redhat.com>\0"
  "Subject\0[RFC PATCH 2/2] kexec, KEYS: Make use of platform keyring for signature verify\0"
- "Date\0Thu, 10 Jan 2019 00:48:24 +0800\0"
+ "Date\0Wed, 09 Jan 2019 16:48:24 +0000\0"
  "To\0linux-kernel@vger.kernel.org\0"
- "Cc\0jwboyer@fedoraproject.org"
-  Kairui Song <kasong@redhat.com>
-  ebiggers@google.com
-  dyoung@redhat.com
-  nayna@linux.ibm.com
-  kexec@lists.infradead.org
+ "Cc\0dhowells@redhat.com"
+  dwmw2@infradead.org
+  jwboyer@fedoraproject.org
+  keyrings@vger.kernel.org
   jmorris@namei.org
+  serge@hallyn.com
   zohar@linux.ibm.com
-  dhowells@redhat.com
-  keyrings@vger.kernel.org
-  linux-integrity@vger.kernel.org
-  dwmw2@infradead.org
   bauerman@linux.ibm.com
- " serge@hallyn.com\0"
+  ebiggers@google.com
+  nayna@linux.ibm.com
+  dyoung@redhat.com
+  linux-integrity@vger.kernel.org
+  kexec@lists.infradead.org
+ " Kairui Song <kasong@redhat.com>\0"
  "\00:1\0"
  "b\0"
  "kexec_file_load will need to verify the kernel signed with third part\n"
@@ -55,7 +55,7 @@
  "+\tret = verify_pefile_signature(kernel, kernel_len,\n"
  "+\t\t\tVERIFY_USE_SECONDARY_KEYRING,\n"
  "+\t\t\tVERIFYING_KEXEC_PE_SIGNATURE);\n"
- "+\tif (ret == -ENOKEY) {\n"
+ "+\tif (ret = -ENOKEY) {\n"
  "+\t\tret = verify_pefile_signature(kernel, kernel_len,\n"
  "+\t\t\t\tVERIFY_USE_PLATFORM_KEYRING,\n"
  "+\t\t\t\tVERIFYING_KEXEC_PE_SIGNATURE);\n"
@@ -82,13 +82,13 @@
  " \t\ttrusted_keys = builtin_trusted_keys;\n"
  "+#endif\n"
  "+#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING\n"
- "+\t} else if (trusted_keys == VERIFY_USE_PLATFORM_KEYRING) {\n"
+ "+\t} else if (trusted_keys = VERIFY_USE_PLATFORM_KEYRING) {\n"
  "+\t\ttrusted_keys = platform_trusted_keys;\n"
  " #endif\n"
  " \t}\n"
  " \tret = pkcs7_validate_trust(pkcs7, trusted_keys);\n"
  " \tif (ret < 0) {\n"
- " \t\tif (ret == -ENOKEY)\n"
+ " \t\tif (ret = -ENOKEY)\n"
  "-\t\t\tpr_err(\"PKCS#7 signature not signed with a trusted key\\n\");\n"
  "+\t\t\tpr_devel(\"PKCS#7 signature not signed with a trusted key\\n\");\n"
  " \t\tgoto error;\n"
@@ -107,12 +107,6 @@
  " /*\n"
  "  * The use to which an asymmetric key is being put.\n"
  "-- \n"
- "2.20.1\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "kexec mailing list\n"
- "kexec@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/kexec
+ 2.20.1
 
-3480786d031e38d56246d5b1f7dbbed65b0320d1694f59f4b1c0383abf3c88e5
+9d60c1b15e6d3bda197e32b7eeb1e7c404c3bbf912bbdeac62252315f145e5c1
