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
..
firmware_loader	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
memory_group_manager
power	Revert "Revert "PM: runtime: Fix unpaired parent child_count for force_resume""	2021-06-04 11:15:17 -07:00
regmap	regmap: set debugfs_name to NULL after it is freed	2021-05-14 09:50:09 +02:00
test	drivers/base: build kunit tests without structleak plugin	2021-03-17 17:06:24 +01:00
arch_topology.c	ANDROID: topology: Add flag to indicate topology has been updated	2021-05-11 22:55:07 +00:00
attribute_container.c
base.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
bus.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
cacheinfo.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
class.c
component.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
container.c
core.c	FROMGIT: drivers: base: Reduce device link removal code duplication	2021-06-04 11:15:18 -07:00
cpu.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
dd.c	Merge 5.10.30 into android12-5.10	2021-04-15 14:23:41 +02:00
devcoredump.c
devres.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
devtmpfs.c	devtmpfs: fix placement of complete() call	2021-05-14 09:50:11 +02:00
driver.c
firmware.c
hypervisor.c
init.c
isa.c
Kconfig	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
Makefile	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
map.c
memory.c	drivers/base/memory: don't store phys_device in memory blocks	2021-03-17 17:06:25 +01:00
module.c
node.c	node: fix device cleanups in error handling code	2021-05-14 09:50:19 +02:00
pinctrl.c
platform-msi.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
platform.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
property.c
soc.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
swnode.c	UPSTREAM: software node: Allow node addition to already existing device	2021-06-10 20:26:29 -07:00
syscore.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
topology.c
transport_class.c