commit 97cdb07b2990b2c6c4c2c9278ad6a36c7d7e4de1
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 04 16:23:23 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 04 16:23:23 2019 -0700
tree 279df686dc676b6f09e3497cc3edaf61373cd3be
parent 0f87e8e4e486880d3795bcaf581f8252b4c91a82
parent 1c8082f8989a29ccfe44d46d465f6f585e54e7b2

Merge "input: touchscreen: cyttsp5: change request flag"

arch/arm64/boot/dts/qcom/sdm429-spyro-qrd-evt.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sdm429-spyro-qrd-evt.dtsi b/arch/arm64/boot/dts/qcom/sdm429-spyro-qrd-evt.dtsi
index 0f73bd9..9014166 100644
--- a/arch/arm64/boot/dts/qcom/sdm429-spyro-qrd-evt.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm429-spyro-qrd-evt.dtsi
@@ -233,7 +233,7 @@
 
 &secure_mem {
 	alignment = <0 0x400000>;
-	size = <0 0x400000>;
+	size = <0 0x800000>;
 	status = "okay";
 };
 

fs/crypto/keyinfo.c

diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c
index 837a3de..9f38e7f 100755
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -606,8 +606,6 @@
 	if (res)
 		goto out;
 
-	memzero_explicit(crypt_info->ci_raw_key,
-		sizeof(crypt_info->ci_raw_key));
 do_ice:
 	if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)
 		crypt_info = NULL;