JohnnLee ffec99e9b1 Merge branch 'LA.UM.9.12.C10.11.00.00.840.478' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19 ...

Conflicts:
	arch/arm64/include/asm/assembler.h
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/include/asm/kvm_mmu.h
	arch/arm64/kernel/cpu_errata.c
	arch/arm64/kernel/cpufeature.c
	arch/arm64/kernel/entry.S
	arch/arm64/kvm/hyp/hyp-entry.S
	arch/arm64/mm/mmu.c
	drivers/net/usb/ax88179_178a.c
	drivers/soc/qcom/scm.c
	drivers/soc/qcom/socinfo.c
	drivers/usb/gadget/function/f_fs.c
	include/linux/arm-smccc.h

Bug: 261541074
Change-Id: I7f46738f04f5c301487dc92db5c5fa808d99bc79
Signed-off-by: JohnnLee <johnnlee@google.com>

2023-02-01 11:14:50 +08:00

..

compat_qcedev.c

…

compat_qcedev.h

…

ice.c

Merge "Set the default slot for Full Disk Encryption key to 31"

2021-03-19 02:18:17 -07:00

iceregs.h

Add support for block disk encryption

2020-10-13 18:17:43 +05:30

Makefile

Merge branch 'LA.UM.9.12.R1.11.00.00.597.108' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19

2021-05-14 10:40:09 +08:00

ota_crypto.c

…

qce50.c

Merge branch 'LA.UM.9.12.R1.11.00.00.597.108' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19

2021-05-14 10:40:09 +08:00

qce50.h

crypto: msm: Support SHA384 & SHA512

2020-07-07 12:09:16 +05:30

qce_ota.h

…

qce.h

crypto: msm: Support SHA384 & SHA512

2020-07-07 12:09:16 +05:30

qcedev_smmu.c

crypto: msm: unmap all ion buffers in qcedev_release

2019-07-01 21:28:44 -07:00

qcedev_smmu.h

crypto: msm: unmap all ion buffers in qcedev_release

2019-07-01 21:28:44 -07:00

qcedev.c

Merge branch 'LA.UM.9.12.C10.11.00.00.840.478' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19

2023-02-01 11:14:50 +08:00

qcedevi.h

crypto: msm: Support SHA384 & SHA512

2020-07-07 12:09:16 +05:30

qcrypto.c

Merge LA.UM.9.12.R2.10.00.00.685.014 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19

2020-06-22 10:01:09 +08:00

qcryptohw_50.h

crypto: msm: Support SHA384 & SHA512

2020-07-07 12:09:16 +05:30