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
..
gameport
joystick	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
keyboard	Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common	2021-05-03 19:52:23 +08:00
misc	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
mouse	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
remotectl	input: rc: add support parser power key by rk pwm controller	2021-03-10 19:34:04 +08:00
rmi4	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
sensors	rk: Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2021-04-09 17:08:07 +08:00
serio	This is the 5.10.32 stable release	2021-04-22 11:12:08 +02:00
tablet	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
touchscreen	Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common	2021-06-25 11:32:04 +08:00
apm-power.c
evbug.c
evdev.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
ff-core.c
ff-memless.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
input-compat.c
input-compat.h
input-leds.c
input-mt.c
input-polldev.c
input-poller.c
input-poller.h
input.c	rk: revert to v4.19	2021-03-17 18:05:39 +08:00
joydev.c	Input: joydev - prevent potential read overflow in ioctl	2021-03-04 11:38:23 +01:00
Kconfig	input: Add IR decode driver	2021-04-08 18:14:45 +08:00
Makefile	input: Add IR decode driver	2021-04-08 18:14:45 +08:00
matrix-keymap.c
mousedev.c
sparse-keymap.c