github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
c6edde69b3
linux/sound
History
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
..
ac97 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
aoa rk: revert to v4.19 2021-03-17 18:05:39 +08:00
arm BACKPORT: UPSTREAM: amba: Make the remove callback return void 2021-03-01 12:52:06 -08:00
atmel
core Merge 5.10.43 into android12-5.10 2021-06-12 14:48:14 +02:00
drivers ALSA: aloop: Fix initialization of controls 2021-04-14 08:41:56 +02:00
firewire ALSA: firewire-lib: fix check for the size of isochronous packet payload 2021-05-26 12:06:51 +02:00
hda ALSA: hda: ignore invalid NHLT table 2021-03-30 14:31:48 +02:00
i2c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
isa Revert "ALSA: gus: add a check of the status of snd_ctl_add" 2021-06-03 09:00:41 +02:00
mips hal2: convert to dma_alloc_noncoherent 2020-09-25 06:20:44 +02:00
oss
parisc
pci ALSA: hda: update the power_state during the direct-complete 2021-06-10 13:39:25 +02:00
pcmcia
ppc
sh rk: revert to v4.19 2021-03-17 18:05:39 +08:00
soc Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-06-25 11:32:04 +08:00
sparc rk: revert to v4.19 2021-03-17 18:05:39 +08:00
spi
synth rk: revert to v4.19 2021-03-17 18:05:39 +08:00
usb Merge 5.10.42 into android12-5.10 2021-06-03 18:47:38 +02:00
x86 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
xen
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00