diff for duplicates of <1588758017-30426-3-git-send-email-sumit.garg@linaro.org>
diff --git a/a/1.txt b/N1/1.txt
index 8988a0d..4fbd10e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -330,7 +330,7 @@ index 0000000..724a73c
+
+static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
+{
-+ if (ver->impl_id = TEE_IMPL_ID_OPTEE)
++ if (ver->impl_id == TEE_IMPL_ID_OPTEE)
+ return 1;
+ else
+ return 0;
diff --git a/a/content_digest b/N1/content_digest
index 874b699..093a108 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v4 2/4] KEYS: trusted: Introduce TEE based Trusted Keys\0"
]
[
- "Date\0Wed, 06 May 2020 09:52:15 +0000\0"
+ "Date\0Wed, 6 May 2020 15:10:15 +0530\0"
]
[
"To\0jarkko.sakkinen\@linux.intel.com",
@@ -16,24 +16,24 @@
" jejb\@linux.ibm.com\0"
]
[
- "Cc\0tee-dev\@lists.linaro.org",
- " daniel.thompson\@linaro.org",
- " Sumit Garg <sumit.garg\@linaro.org>",
- " op-tee\@lists.trustedfirmware.org",
+ "Cc\0dhowells\@redhat.com",
+ " jens.wiklander\@linaro.org",
" corbet\@lwn.net",
- " janne.karhunen\@gmail.com",
- " linux-doc\@vger.kernel.org",
" jmorris\@namei.org",
- " linux-kernel\@vger.kernel.org",
- " dhowells\@redhat.com",
- " linux-security-module\@vger.kernel.org",
- " keyrings\@vger.kernel.org",
- " Markus.Wamser\@mixed-mode.de",
+ " serge\@hallyn.com",
" casey\@schaufler-ca.com",
+ " janne.karhunen\@gmail.com",
+ " daniel.thompson\@linaro.org",
+ " Markus.Wamser\@mixed-mode.de",
+ " keyrings\@vger.kernel.org",
" linux-integrity\@vger.kernel.org",
- " jens.wiklander\@linaro.org",
+ " linux-security-module\@vger.kernel.org",
+ " linux-doc\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
" linux-arm-kernel\@lists.infradead.org",
- " serge\@hallyn.com\0"
+ " op-tee\@lists.trustedfirmware.org",
+ " tee-dev\@lists.linaro.org",
+ " Sumit Garg <sumit.garg\@linaro.org>\0"
]
[
"\0000:1\0"
@@ -374,7 +374,7 @@
"+\n",
"+static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)\n",
"+{\n",
- "+\tif (ver->impl_id = TEE_IMPL_ID_OPTEE)\n",
+ "+\tif (ver->impl_id == TEE_IMPL_ID_OPTEE)\n",
"+\t\treturn 1;\n",
"+\telse\n",
"+\t\treturn 0;\n",
@@ -474,4 +474,4 @@
"2.7.4"
]
-17324de23fc49c753510b6bb12fae108234c8c86b56b02007ca43a1028d2e6ec
+5894a9af48146f082dde852d695ca76b79e2d9964384353ca4ce1484e8466814
diff --git a/a/1.txt b/N2/1.txt
index 8988a0d..22f2295 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -330,7 +330,7 @@ index 0000000..724a73c
+
+static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
+{
-+ if (ver->impl_id = TEE_IMPL_ID_OPTEE)
++ if (ver->impl_id == TEE_IMPL_ID_OPTEE)
+ return 1;
+ else
+ return 0;
@@ -427,4 +427,10 @@ index 0000000..724a73c
+};
+EXPORT_SYMBOL_GPL(tee_trusted_key_ops);
--
-2.7.4
\ No newline at end of file
+2.7.4
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 874b699..3c0d3ac 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v4 2/4] KEYS: trusted: Introduce TEE based Trusted Keys\0"
]
[
- "Date\0Wed, 06 May 2020 09:52:15 +0000\0"
+ "Date\0Wed, 6 May 2020 15:10:15 +0530\0"
]
[
"To\0jarkko.sakkinen\@linux.intel.com",
@@ -374,7 +374,7 @@
"+\n",
"+static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)\n",
"+{\n",
- "+\tif (ver->impl_id = TEE_IMPL_ID_OPTEE)\n",
+ "+\tif (ver->impl_id == TEE_IMPL_ID_OPTEE)\n",
"+\t\treturn 1;\n",
"+\telse\n",
"+\t\treturn 0;\n",
@@ -471,7 +471,13 @@
"+};\n",
"+EXPORT_SYMBOL_GPL(tee_trusted_key_ops);\n",
"-- \n",
- "2.7.4"
+ "2.7.4\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "linux-arm-kernel mailing list\n",
+ "linux-arm-kernel\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-arm-kernel"
]
-17324de23fc49c753510b6bb12fae108234c8c86b56b02007ca43a1028d2e6ec
+d765dac9a83ae8d05146a228817f3d39c1fc92215540d67ac25bcd55372cb5d6
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.