linux/drivers/crypto
Tao Huang 582f79266f Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common
* android12-5.10: (2274 commits)
  FROMGIT: mm: slub: move sysfs slab alloc/free interfaces to debugfs
  ANDROID: gki - CONFIG_NET_SCH_FQ=y
  ANDROID: GKI: Kconfig.gki: Add GKI_HIDDEN_ETHERNET_CONFIGS
  FROMLIST: media: Kconfig: Fix DVB_CORE can't be selected as module
  ANDROID: Update ABI and symbol list
  Revert "net: usb: cdc_ncm: don't spew notifications"
  ANDROID: Fips 140: move fips symbols entirely in own list
  ANDROID: core of xt_IDLETIMER send_nl_msg support
  ANDROID: start to re-add xt_IDLETIMER send_nl_msg support
  ANDROID: add fips140.ko symbols to module ABI
  ANDROID: inject correct HMAC digest into fips140.ko at build time
  ANDROID: crypto: fips140 - perform load time integrity check
  FROMLIST: crypto: shash - stop comparing function pointers to avoid breaking CFI
  ANDROID: arm64: module: preserve RELA sections for FIPS140 integrity selfcheck
  ANDROID: arm64: simd: omit capability check in may_use_simd()
  ANDROID: kbuild: lto: permit the use of .a archives in LTO modules
  ANDROID: arm64: only permit certain alternatives in the FIPS140 module
  ANDROID: crypto: lib/aes - add vendor hooks for AES library routines
  ANDROID: crypto: lib/sha256 - add vendor hook for sha256() routine
  UPSTREAM: KVM: arm64: Mark the host stage-2 memory pools static
  ...

Conflicts:
	drivers/mmc/core/mmc_ops.c
	drivers/usb/gadget/function/f_uac1.c
	drivers/usb/gadget/function/f_uac2.c
	drivers/usb/gadget/function/f_uvc.c
2021-06-25 11:32:04 +08:00
..
allwinner crypto: sun8i-ss - Fix memory leak of pad 2021-05-14 09:50:17 +02:00
amcc rk: revert to v4.19 2021-03-17 18:05:39 +08:00
amlogic
axis rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bcm rk: revert to v4.19 2021-03-17 18:05:39 +08:00
caam rk: revert to v4.19 2021-03-17 18:05:39 +08:00
cavium Revert "crypto: cavium/nitrox - add an error message to explain the failure of pci_request_mem_regions" 2021-06-03 09:00:40 +02:00
ccp crypto: ccp: Free SEV device if SEV init fails 2021-05-19 10:12:58 +02:00
ccree rk: revert to v4.19 2021-03-17 18:05:39 +08:00
chelsio crypto: chelsio - Read rxchannel-id from firmware 2021-05-14 09:50:19 +02:00
hisilicon crypto: hisilicon/sec - fixes a printing error 2021-05-11 14:47:17 +02:00
inside-secure UPSTREAM: crypto: remove cipher routines from public crypto API 2021-05-13 07:53:31 +00:00
marvell crypto: marvel/cesa - Fix tdma descriptor on 64-bit 2021-02-03 23:28:40 +01:00
mediatek rk: revert to v4.19 2021-03-17 18:05:39 +08:00
nx rk: revert to v4.19 2021-03-17 18:05:39 +08:00
qat Merge 5.10.37 into android12-5.10 2021-05-15 09:28:55 +02:00
qce
rockchip Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-03-17 18:07:51 +08:00
stm32 crypto: stm32/cryp - Fix PM reference leak on stm32-cryp.c 2021-05-11 14:47:21 +02:00
ux500 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
virtio rk: revert to v4.19 2021-03-17 18:05:39 +08:00
vmx UPSTREAM: crypto: remove cipher routines from public crypto API 2021-05-13 07:53:31 +00:00
xilinx
atmel-aes-regs.h
atmel-aes.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
atmel-authenc.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
atmel-ecc.c
atmel-i2c.c
atmel-i2c.h
atmel-sha-regs.h
atmel-sha.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
atmel-sha204a.c
atmel-tdes-regs.h
atmel-tdes.c crypto: atmel-tdes - use semicolons rather than commas to separate statements 2020-10-02 18:02:15 +10:00
exynos-rng.c
geode-aes.c UPSTREAM: crypto: remove cipher routines from public crypto API 2021-05-13 07:53:31 +00:00
geode-aes.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hifn_795x.c crypto: drivers - use semicolons rather than commas to separate statements 2020-10-02 18:02:15 +10:00
img-hash.c
ixp4xx_crypto.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Makefile
mxs-dcp.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
n2_asm.S
n2_core.c
n2_core.h
omap-aes-gcm.c
omap-aes.c crypto: omap-aes - Fix PM reference leak on omap-aes.c 2021-05-11 14:47:21 +02:00
omap-aes.h
omap-crypto.c
omap-crypto.h
omap-des.c
omap-sham.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
padlock-aes.c
padlock-sha.c
picoxcell_crypto_regs.h
picoxcell_crypto.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
qcom-rng.c
s5p-sss.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sa2ul.c crypto: sa2ul - Fix memory leak of rxd 2021-05-14 09:50:17 +02:00
sa2ul.h
sahara.c
talitos.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
talitos.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00