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
..
altera-stapl	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
c2port
cardreader	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
cb710
cxl	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
echo	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
eeprom	misc: eeprom: at24: check suspend status before disable regulator	2021-05-26 12:06:50 +02:00
genwqe	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
habanalabs	habanalabs: Call put_pid() when releasing control device	2021-03-30 14:31:50 +02:00
ibmasm
lis3lv02d	platform/x86: hp_accel: Avoid invoking _INI to speed up resume	2021-06-03 09:00:39 +02:00
lkdtm	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
mei	mei: request autosuspend after sending rx flow control	2021-06-03 09:00:32 +02:00
ocxl	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
sgi-gru	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
sgi-xp	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
ti-st
uacce
vmw_vmci	misc: vmw_vmci: explicitly initialize vmci_datagram payload	2021-05-14 09:49:59 +02:00
ad525x_dpot-i2c.c
ad525x_dpot-spi.c
ad525x_dpot.c
ad525x_dpot.h
apds990x.c
apds9802als.c
atmel_tclib.c
atmel-ssc.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
bh1770glc.c
cs5535-mfgpt.c
ds1682.c
dummy-irq.c
enclosure.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
fastrpc.c	misc: fastrpc: restrict user apps from sending kernel RPC messages	2021-03-17 17:06:31 +01:00
gpio-detection.c
hisi_hikey_usb.c
hmc6352.c
hpilo.c
hpilo.h
ibmvmc.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
ibmvmc.h
ics932s401.c	ics932s401: fix broken handling of errors when word reading fails	2021-05-26 12:06:56 +02:00
isl29003.c
isl29020.c
Kconfig	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
kgdbts.c	kgdb: fix gcc-11 warnings harder	2021-06-03 09:00:31 +02:00
lattice-ecp3-config.c
Makefile	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
pch_phub.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
pci_endpoint_test.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
phantom.c
pir-aschip.c
pti.c
pvpanic.c	misc/pvpanic: Export module FDT device table	2021-03-17 17:06:31 +01:00
qcom-coincell.c
rk_scr.c
rk_scr.h
sram-exec.c
sram.c
sram.h
tifm_7xx1.c
tifm_core.c
tsl2550.c
uid_sys_stats.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
usb_cam_gpio.c
vmw_balloon.c
xilinx_sdfec.c