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
..
devres.c
extcon-adc-jack.c
extcon-arizona.c	extcon: arizona: Fix various races on driver unbind	2021-05-11 14:47:24 +02:00
extcon-axp288.c
extcon-fsa9480.c
extcon-gpio.c
extcon-intel-cht-wc.c
extcon-intel-int3496.c
extcon-intel-mrfld.c
extcon-intel.h
extcon-max3355.c
extcon-max8997.c
extcon-max14577.c
extcon-max77693.c	extcon: max77693: Fix modalias string	2020-12-30 11:53:49 +01:00
extcon-max77843.c
extcon-palmas.c
extcon-ptn5150.c
extcon-qcom-spmi-misc.c
extcon-rt8973a.c
extcon-rt8973a.h
extcon-sm5502.c
extcon-sm5502.h
extcon-usb-gpio.c
extcon-usbc-cros-ec.c
extcon.c	extcon: Add EXTCON_USB_VBUS_EN for USB Type-C	2021-05-31 14:54:40 +08:00
extcon.h
Kconfig
Makefile