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
..
broadcom	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
intel	thermal/drivers/intel: Initialize RW trip to THERMAL_TEMP_INVALID	2021-06-03 09:00:35 +02:00
qcom	thermal/drivers/tsens: Fix missing put_device error	2021-05-19 10:13:03 +02:00
samsung	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
st
tegra
ti-soc-thermal	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
amlogic_thermal.c
armada_thermal.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
cpufreq_cooling.c	thermal/drivers/cpufreq_cooling: Fix slab OOB issue	2021-05-11 14:47:40 +02:00
cpuidle_cooling.c
da9062-thermal.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
db8500_thermal.c
devfreq_cooling.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
dove_thermal.c
gov_bang_bang.c
gov_fair_share.c	thermal/core/fair share: Lock the thermal zone while looping over instances	2021-05-11 14:47:41 +02:00
gov_power_allocator.c
gov_step_wise.c
gov_user_space.c
hisi_thermal.c
imx_sc_thermal.c
imx_thermal.c
imx8mm_thermal.c
k3_bandgap.c
Kconfig	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
khadas_mcu_fan.c
kirkwood_thermal.c
Makefile	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
max77620_thermal.c
mtk_thermal.c
qoriq_thermal.c
rcar_gen3_thermal.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
rcar_thermal.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
rk_virtual_thermal.c
rk3368_thermal.c
rockchip_thermal.c	thermal: rockchip: Support RK3568 SoCs in the thermal driver	2021-05-20 18:41:43 +08:00
spear_thermal.c
sprd_thermal.c
sun8i_thermal.c
tango_thermal.c
thermal_core.c	ANDROID: thermal: Add vendor thermal_pm_notify_suspend function	2021-05-11 15:15:04 +00:00
thermal_core.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
thermal_helpers.c
thermal_hwmon.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
thermal_hwmon.h	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
thermal_mmio.c
thermal_netlink.c	ANDROID: thermal: Add logic for filter on-die tz genl event.	2021-03-16 23:42:07 +00:00
thermal_netlink.h
thermal_of.c	thermal: thermal_of: Fix error return code of thermal_of_populate_bind_params()	2021-05-19 10:13:00 +02:00
thermal_sysfs.c	thermal/core: Add NULL pointer check before using cooling device stats	2021-04-07 15:00:06 +02:00
thermal-generic-adc.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
uniphier_thermal.c
zx2967_thermal.c