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
..
6lowpan
9p
802
8021q
appletalk
atm
ax25
batman-adv
bluetooth	Bluetooth: use correct lock to prevent UAF of hdev object	2021-06-10 13:39:23 +02:00
bpf
bpfilter
bridge
caif	net: caif: fix memory leak in cfusbl_device_notify	2021-06-10 13:39:25 +02:00
can
ceph
core	Merge 5.10.43 into android12-5.10	2021-06-12 14:48:14 +02:00
dcb
dccp
decnet
dns_resolver
dsa	net: dsa: tag_8021q: fix the VLAN IDs used for encoding sub-VLANs	2021-06-10 13:39:17 +02:00
ethernet
ethtool
hsr	net: hsr: fix mac_len checks	2021-06-03 09:00:50 +02:00
ieee802154	ieee802154: fix error return code in ieee802154_llsec_getparams()	2021-06-10 13:39:19 +02:00
ife
ipv4
ipv6	Merge 5.10.43 into android12-5.10	2021-06-12 14:48:14 +02:00
iucv
kcm
key
l2tp
l3mdev
lapb
llc
mac80211	mac80211: extend protection against mixed key and fragment cache attacks	2021-06-03 09:00:29 +02:00
mac802154
mpls
mptcp	mptcp: always parse mptcp options for MPC reqsk	2021-06-10 13:39:16 +02:00
ncsi
netfilter	Merge 5.10.43 into android12-5.10	2021-06-12 14:48:14 +02:00
netlabel
netlink
netrom
nfc	nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect	2021-06-10 13:39:27 +02:00
nsh
openvswitch	openvswitch: meter: fix race when getting now_ms.	2021-06-03 09:00:47 +02:00
packet	net: packetmmap: fix only tx timestamp on request	2021-06-03 09:00:46 +02:00
phonet
psample
qrtr
rds
rfkill
rose
rxrpc
sched	net/sched: act_ct: Fix ct template allocation for zone 0	2021-06-10 13:39:16 +02:00
sctp
smc	net/smc: remove device from smcd_dev_list after failed device_add()	2021-06-03 09:00:48 +02:00
strparser
sunrpc	SUNRPC: More fixes for backlog congestion	2021-06-03 09:00:51 +02:00
switchdev
tipc	tipc: fix unique bearer names sanity check	2021-06-10 13:39:22 +02:00
tls	net/tls: Fix use-after-free after the TLS device goes down and up	2021-06-10 13:39:18 +02:00
unix
vmw_vsock
wimax
wireless	Merge 5.10.42 into android12-5.10	2021-06-03 18:47:38 +02:00
x25
xdp
xfrm
compat.c
devres.c
Kconfig
Makefile
OWNERS
socket.c
sysctl_net.c