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
..
chips	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
devices	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
hyperbus
lpddr	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
maps	mtd: maps: fix error return code of physmap_flash_remove()	2021-05-14 09:50:09 +02:00
nand	Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common	2021-06-25 11:32:04 +08:00
parsers	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
rknand
spi-nor	Revert "mtd: spi-nor: macronix: Add support for mx25l51245g"	2021-05-11 14:47:13 +02:00
tests
ubi	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
ftl.c
inftlcore.c
inftlmount.c
Kconfig
Makefile
mtd_blkdevs.c
mtdblock_ro.c
mtdblock.c
mtdchar.c	mtd: require write permissions for locking and badblock ioctls	2021-05-14 09:50:13 +02:00
mtdconcat.c
mtdcore.c	mtd: Handle possible -EPROBE_DEFER from parse_mtd_partitions()	2021-05-14 09:50:09 +02:00
mtdcore.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
mtdoops.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
mtdpart.c	mtd: don't lock when recursively deleting partitions	2021-05-14 09:50:09 +02:00
mtdpstore.c
mtdsuper.c
mtdswap.c
nftlcore.c
nftlmount.c
rfd_ftl.c
sm_ftl.c
sm_ftl.h
ssfdc.c