diff for duplicates of <20201013015230.GA45644@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index d5bf568..9e80829 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -312,7 +312,7 @@ Ditto. > + > +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 ced4e19..037403d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,27 +2,27 @@ "ref\01602065268-26017-3-git-send-email-sumit.garg@linaro.org\0" "From\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" "Subject\0Re: [PATCH v7 2/4] KEYS: trusted: Introduce TEE based Trusted Keys\0" - "Date\0Tue, 13 Oct 2020 01:52:30 +0000\0" + "Date\0Tue, 13 Oct 2020 04:52:30 +0300\0" "To\0Sumit Garg <sumit.garg@linaro.org>\0" - "Cc\0linux-security-module@vger.kernel.org" - daniel.thompson@linaro.org - op-tee@lists.trustedfirmware.org - corbet@lwn.net + "Cc\0zohar@linux.ibm.com" jejb@linux.ibm.com - janne.karhunen@gmail.com - linux-doc@vger.kernel.org - jmorris@namei.org - zohar@linux.ibm.com - linux-kernel@vger.kernel.org dhowells@redhat.com + jens.wiklander@linaro.org + corbet@lwn.net + jmorris@namei.org + serge@hallyn.com + casey@schaufler-ca.com + janne.karhunen@gmail.com + daniel.thompson@linaro.org + Markus.Wamser@mixed-mode.de lhinds@redhat.com keyrings@vger.kernel.org - Markus.Wamser@mixed-mode.de - casey@schaufler-ca.com 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\0" "\00:1\0" "b\0" "On Wed, Oct 07, 2020 at 03:37:46PM +0530, Sumit Garg wrote:\n" @@ -339,7 +339,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" @@ -443,4 +443,4 @@ "\n" /Jarkko -766db79c18476a283af4adddad7a616cb5618bfa1567bc578cc917de8f5364aa +3f4f36af7ff6f02084be49a1cd00b2d785f65885cfd0d61da71344f99a94e677
diff --git a/a/1.txt b/N2/1.txt index d5bf568..9e80829 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -312,7 +312,7 @@ Ditto. > + > +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/N2/content_digest index ced4e19..f083779 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,29 +1,9 @@ - "ref\01602065268-26017-1-git-send-email-sumit.garg@linaro.org\0" "ref\01602065268-26017-3-git-send-email-sumit.garg@linaro.org\0" "From\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" "Subject\0Re: [PATCH v7 2/4] KEYS: trusted: Introduce TEE based Trusted Keys\0" - "Date\0Tue, 13 Oct 2020 01:52:30 +0000\0" - "To\0Sumit Garg <sumit.garg@linaro.org>\0" - "Cc\0linux-security-module@vger.kernel.org" - daniel.thompson@linaro.org - op-tee@lists.trustedfirmware.org - corbet@lwn.net - jejb@linux.ibm.com - janne.karhunen@gmail.com - linux-doc@vger.kernel.org - jmorris@namei.org - zohar@linux.ibm.com - linux-kernel@vger.kernel.org - dhowells@redhat.com - lhinds@redhat.com - keyrings@vger.kernel.org - Markus.Wamser@mixed-mode.de - casey@schaufler-ca.com - linux-integrity@vger.kernel.org - jens.wiklander@linaro.org - linux-arm-kernel@lists.infradead.org - " serge@hallyn.com\0" - "\00:1\0" + "Date\0Tue, 13 Oct 2020 04:52:30 +0300\0" + "To\0op-tee@lists.trustedfirmware.org\0" + "\01:1\0" "b\0" "On Wed, Oct 07, 2020 at 03:37:46PM +0530, Sumit Garg wrote:\n" "> Add support for TEE based trusted keys where TEE provides the functionality\n" @@ -339,7 +319,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" @@ -443,4 +423,4 @@ "\n" /Jarkko -766db79c18476a283af4adddad7a616cb5618bfa1567bc578cc917de8f5364aa +b372ba5a87f5359649dad2306052cd26183512daae40e2409233ea6b8d68d797
diff --git a/a/1.txt b/N3/1.txt index d5bf568..469f1ef 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -312,7 +312,7 @@ Ditto. > + > +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; @@ -415,3 +415,8 @@ Couldn't you just overwrite 'ret'? > /Jarkko + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N3/content_digest index ced4e19..8f6e09b 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,7 +2,7 @@ "ref\01602065268-26017-3-git-send-email-sumit.garg@linaro.org\0" "From\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" "Subject\0Re: [PATCH v7 2/4] KEYS: trusted: Introduce TEE based Trusted Keys\0" - "Date\0Tue, 13 Oct 2020 01:52:30 +0000\0" + "Date\0Tue, 13 Oct 2020 04:52:30 +0300\0" "To\0Sumit Garg <sumit.garg@linaro.org>\0" "Cc\0linux-security-module@vger.kernel.org" daniel.thompson@linaro.org @@ -339,7 +339,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" @@ -441,6 +441,11 @@ "> 2.7.4\n" "> \n" "\n" - /Jarkko + "/Jarkko\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 -766db79c18476a283af4adddad7a616cb5618bfa1567bc578cc917de8f5364aa +cd803bbd5f16ac237d7e4a5b9362814be3e1f2ac4c1367cf403314969ef0ce6d
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.