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
e58b8f0d41
linux/arch
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
..
alpha BACKPORT: FROMGIT: mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable() 2021-06-07 20:38:48 +00:00
arc ARC: mm: Use max_high_pfn as a HIGHMEM zone border 2021-05-19 10:13:10 +02:00
arm Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-06-25 11:32:04 +08:00
arm64 Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-06-25 11:32:04 +08:00
c6x
csky Merge 5.10.33 into android12-5.10 2021-04-29 13:57:47 +02:00
h8300 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hexagon rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ia64 BACKPORT: FROMGIT: mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable() 2021-06-07 20:38:48 +00:00
m68k BACKPORT: FROMGIT: mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable() 2021-06-07 20:38:48 +00:00
microblaze rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mips Merge 5.10.42 into android12-5.10 2021-06-03 18:47:38 +02:00
nds32 nds32: flush_dcache_page: use page_mapping_file to avoid races with swapoff 2021-04-14 08:41:58 +02:00
nios2 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
openrisc openrisc: Define memory barrier mb 2021-06-03 09:00:44 +02:00
parisc UPSTREAM: parisc: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY 2021-06-10 20:26:03 -07:00
powerpc Merge 5.10.43 into android12-5.10 2021-06-12 14:48:14 +02:00
riscv Merge 5.10.43 into android12-5.10 2021-06-12 14:48:14 +02:00
s390 BACKPORT: FROMGIT: mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable() 2021-06-07 20:38:48 +00:00
sh BACKPORT: FROMGIT: hugetlb: pass vma into huge_pte_alloc() and huge_pmd_share() 2021-04-09 15:35:58 -07:00
sparc BACKPORT: FROMGIT: hugetlb: pass vma into huge_pte_alloc() and huge_pmd_share() 2021-04-09 15:35:58 -07:00
um This is the 5.10.39 stable release 2021-05-22 15:34:48 +02:00
x86 ANDROID: gki - CONFIG_NET_SCH_FQ=y 2021-06-15 00:40:03 -07:00
xtensa Merge 5.10.28 into android12-5.10 2021-04-09 09:29:17 +02:00
.gitignore
Kconfig rk: revert to v4.19 2021-03-17 18:05:39 +08:00