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
..
agp	parisc: parisc-agp requires SBA IOMMU driver	2021-04-14 08:41:59 +02:00
hw_random	Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common	2021-04-25 18:33:22 +08:00
ipmi	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
mwave	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
pcmcia
tpm	tpm, tpm_tis: Reserve locality in tpm_tis_resume()	2021-05-19 10:12:51 +02:00
xilinx_hwicap
xillybus
adi.c
apm-emulation.c
applicom.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
applicom.h
bsr.c
ds1620.c
dsp56k.c
dtlk.c
hangcheck-timer.c
hpet.c	char: hpet: add checks after calling ioremap	2021-06-03 09:00:41 +02:00
Kconfig	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
lp.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
Makefile
mem.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
misc.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
mspec.c
nsc_gpio.c
nvram.c
nwbutton.c
nwbutton.h
nwflash.c
pc8736x_gpio.c
powernv-op-panel.c
ppdev.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
ps3flash.c
random.c	random: initialize ChaCha20 constants with correct endianness	2021-05-11 14:47:19 +02:00
raw.c
scx200_gpio.c
sonypi.c
tb0219.c
tlclk.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
toshiba.c
ttyprintk.c	ttyprintk: Add TTY hangup callback.	2021-05-14 09:50:21 +02:00
uv_mmtimer.c
virtio_console.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00