github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
7fbdf804c1
linux/security
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
..
apparmor rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bpf bpf: Implement bpf_local_storage for inodes 2020-08-25 15:00:04 -07:00
integrity Merge 5.10.37 into android12-5.10 2021-05-15 09:28:55 +02:00
keys KEYS: trusted: Fix memory leak on object td 2021-05-19 10:12:50 +02:00
loadpin LSM: Add "contents" flag to kernel_read_file hook 2020-10-05 13:37:03 +02:00
lockdown
optee_linuxdriver rk: remove ioremap_nocache and devm_ioremap_nocache 2021-04-12 19:24:04 +08:00
safesetid LSM: SafeSetID: Fix warnings reported by test bot 2020-10-13 09:17:36 -07:00
selinux Merge 5.10.37 into android12-5.10 2021-05-15 09:28:55 +02:00
smack rk: revert to v4.19 2021-03-17 18:05:39 +08:00
tomoyo rk: revert to v4.19 2021-03-17 18:05:39 +08:00
yama rk: revert to v4.19 2021-03-17 18:05:39 +08:00
commoncap.c Merge 5.10.36 into android12-5.10 2021-05-13 14:22:11 +02:00
device_cgroup.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
inode.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig.hardening BACKPORT: kasan: remove redundant config option 2021-03-24 15:09:15 -07:00
lsm_audit.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Makefile rk: revert to v4.19 2021-03-17 18:05:39 +08:00
min_addr.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
security.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00