diff for duplicates of <20200615182457.GB5416@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 8c1a436..87e5e2f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -373,7 +373,7 @@ extern trusted_key_ops *trusted_key_ops; > + return 0; > + > + ret = trusted_key_ops->init(); -> + if (ret = -ENODEV) +> + if (ret == -ENODEV) > + return 0; > + > + return ret; diff --git a/a/content_digest b/N1/content_digest index 09de06a..1c2e07c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,27 +2,27 @@ "ref\01591107505-6030-2-git-send-email-sumit.garg@linaro.org\0" "From\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" "Subject\0Re: [PATCH v5 1/4] KEYS: trusted: Add generic trusted keys framework\0" - "Date\0Mon, 15 Jun 2020 18:24:57 +0000\0" + "Date\0Mon, 15 Jun 2020 21:24:57 +0300\0" "To\0Sumit Garg <sumit.garg@linaro.org>\0" - "Cc\0tee-dev@lists.linaro.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 - linux-security-module@vger.kernel.org - keyrings@vger.kernel.org - Markus.Wamser@mixed-mode.de + 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 + 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\0" "\00:1\0" "b\0" "On Tue, Jun 02, 2020 at 07:48:22PM +0530, Sumit Garg wrote:\n" @@ -400,7 +400,7 @@ "> +\t\treturn 0;\n" "> +\n" "> +\tret = trusted_key_ops->init();\n" - "> +\tif (ret = -ENODEV)\n" + "> +\tif (ret == -ENODEV)\n" "> +\t\treturn 0;\n" "> +\n" "> +\treturn ret;\n" @@ -902,4 +902,4 @@ "\n" /Jarkko -e4e893bd206a666aee7dcc783ecf313e281fe0e4adc48c57570df28a2974663f +2802568f6c4a22c99813955f24cacd3c6aeaf4ed9ce4633b86d2df4104798771
diff --git a/a/1.txt b/N2/1.txt index 8c1a436..87e5e2f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -373,7 +373,7 @@ extern trusted_key_ops *trusted_key_ops; > + return 0; > + > + ret = trusted_key_ops->init(); -> + if (ret = -ENODEV) +> + if (ret == -ENODEV) > + return 0; > + > + return ret; diff --git a/a/content_digest b/N2/content_digest index 09de06a..a9887b2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,29 +1,9 @@ - "ref\01591107505-6030-1-git-send-email-sumit.garg@linaro.org\0" "ref\01591107505-6030-2-git-send-email-sumit.garg@linaro.org\0" "From\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" - "Subject\0Re: [PATCH v5 1/4] KEYS: trusted: Add generic trusted keys framework\0" - "Date\0Mon, 15 Jun 2020 18:24:57 +0000\0" - "To\0Sumit Garg <sumit.garg@linaro.org>\0" - "Cc\0tee-dev@lists.linaro.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 - linux-security-module@vger.kernel.org - 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" + "Subject\0Re: [op-tee] [PATCH v5 1/4] KEYS: trusted: Add generic trusted keys framework\0" + "Date\0Mon, 15 Jun 2020 21:24:57 +0300\0" + "To\0op-tee@lists.trustedfirmware.org\0" + "\01:1\0" "b\0" "On Tue, Jun 02, 2020 at 07:48:22PM +0530, Sumit Garg wrote:\n" "> diff --git a/security/keys/Kconfig b/security/keys/Kconfig\n" @@ -400,7 +380,7 @@ "> +\t\treturn 0;\n" "> +\n" "> +\tret = trusted_key_ops->init();\n" - "> +\tif (ret = -ENODEV)\n" + "> +\tif (ret == -ENODEV)\n" "> +\t\treturn 0;\n" "> +\n" "> +\treturn ret;\n" @@ -902,4 +882,4 @@ "\n" /Jarkko -e4e893bd206a666aee7dcc783ecf313e281fe0e4adc48c57570df28a2974663f +c43c6d059cf5f2b2391c796d62b0013ccf684d81f4fccf0111326b332096dcd0
diff --git a/a/1.txt b/N3/1.txt index 8c1a436..0afdf4e 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -373,7 +373,7 @@ extern trusted_key_ops *trusted_key_ops; > + return 0; > + > + ret = trusted_key_ops->init(); -> + if (ret = -ENODEV) +> + if (ret == -ENODEV) > + return 0; > + > + return ret; @@ -874,3 +874,8 @@ Rename this as trusted_key_ops and remove EXPORT_SYMBOL_GPL() > /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 09de06a..c9f662a 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,7 +2,7 @@ "ref\01591107505-6030-2-git-send-email-sumit.garg@linaro.org\0" "From\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" "Subject\0Re: [PATCH v5 1/4] KEYS: trusted: Add generic trusted keys framework\0" - "Date\0Mon, 15 Jun 2020 18:24:57 +0000\0" + "Date\0Mon, 15 Jun 2020 21:24:57 +0300\0" "To\0Sumit Garg <sumit.garg@linaro.org>\0" "Cc\0tee-dev@lists.linaro.org" daniel.thompson@linaro.org @@ -400,7 +400,7 @@ "> +\t\treturn 0;\n" "> +\n" "> +\tret = trusted_key_ops->init();\n" - "> +\tif (ret = -ENODEV)\n" + "> +\tif (ret == -ENODEV)\n" "> +\t\treturn 0;\n" "> +\n" "> +\treturn ret;\n" @@ -900,6 +900,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 -e4e893bd206a666aee7dcc783ecf313e281fe0e4adc48c57570df28a2974663f +2d6bf14bf047eda3dd261de8fd5185ce5bda7b93aa938a0a11849718948eb118
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.