linux/Documentation
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
..
ABI Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.10.y' into android12-5.10 2021-06-04 16:30:01 -07:00
accounting rk: revert to v4.19 2021-03-17 18:05:39 +08:00
admin-guide FROMGIT: userfaultfd/shmem: advertise shmem minor fault support 2021-06-04 19:13:03 +00:00
arm ARM: 9012/1: move device tree mapping out of linear region 2021-05-19 10:13:18 +02:00
arm64 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
block rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bpf
cdrom
core-api rk: revert to v4.19 2021-03-17 18:05:39 +08:00
cpu-freq
crypto UPSTREAM: crypto: remove cipher routines from public crypto API 2021-05-13 07:53:31 +00:00
dev-tools FROMGIT: kasan: Add KASAN mode kernel parameter 2021-04-24 19:37:58 +02:00
device-mapper rk: revert to v4.19 2021-03-17 18:05:39 +08:00
devicetree Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-06-25 11:32:04 +08:00
doc-guide
driver-api firmware: xilinx: Remove zynqmp_pm_get_eemi_ops() in IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE) 2021-05-14 09:50:05 +02:00
fault-injection
fb
features
filesystems Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.10.y' into android12-5.10 2021-05-14 18:14:44 -07:00
firmware_class
firmware-guide Documentation: ACPI: fix spelling mistakes 2020-11-10 18:48:56 +01:00
fpga
gpu drm: Use USB controller's DMA mask when importing dmabufs 2021-03-17 17:06:19 +01:00
hid rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hwmon
i2c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ia64
ide
iio
infiniband
input
isdn
kbuild rk: revert to v4.19 2021-03-17 18:05:39 +08:00
kernel-hacking
leds docs: leds: index.rst: add a missing file 2020-11-02 13:45:37 +01:00
litmus-tests
livepatch
locking Documentation: seqlock: s/LOCKTYPE/LOCKNAME/g 2020-12-30 11:54:11 +01:00
m68k
maintainer
mhi
mips
misc-devices Documentation: remove mic/index from misc-devices/index.rst 2020-11-04 11:38:32 +01:00
netlabel
networking This is the 5.10.24 stable release 2021-03-19 09:42:56 +01:00
nios2
nvdimm
openrisc
parisc
PCI
pcmcia
power rk: revert to v4.19 2021-03-17 18:05:39 +08:00
powerpc powerpc/64s/syscall: Use pt_regs.trap to distinguish syscall ABI difference between sc and scv syscalls 2021-05-26 12:06:53 +02:00
process docs: networking: drop special stable handling 2021-03-17 17:06:13 +01:00
RCU
riscv
s390
scheduler rk: revert to v4.19 2021-03-17 18:05:39 +08:00
scsi scsi: libsas: Introduce a _gfp() variant of event notifiers 2021-03-25 09:04:11 +01:00
security watch_queue: Drop references to /dev/watch_queue 2021-03-04 11:37:59 +01:00
sh
sound rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sparc
sphinx tweewide: Fix most Shebang lines 2021-05-22 11:40:55 +02:00
sphinx-static
spi
staging
target tweewide: Fix most Shebang lines 2021-05-22 11:40:55 +02:00
timers
trace This is the 5.10.39 stable release 2021-05-22 15:34:48 +02:00
translations net: switch to the kernel.org patchwork instance 2020-11-11 17:12:00 -08:00
usb rk: revert to v4.19 2021-03-17 18:05:39 +08:00
userspace-api UPSTREAM: media: docs: Document CLL and Mastering display colorimetry controls 2021-06-04 11:15:20 -07:00
virt Merge 5.10.27 into android12-5.10 2021-04-02 15:25:50 +02:00
vm FROMGIT: mm/page_owner: record the timestamp of all pages during free 2021-03-30 18:46:11 +00:00
w1
watchdog
x86 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
xtensa xtensa: fix TLBTEMP area placement 2020-11-16 02:13:15 -08:00
.gitignore
asm-annotations.rst x86/entry: Emit a symbol for register restoring thunk 2021-02-03 23:28:40 +01:00
atomic_bitops.txt
atomic_t.txt rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Changes
CodingStyle
conf.py rk: revert to v4.19 2021-03-17 18:05:39 +08:00
COPYING-logo
docutils.conf
dontdiff kbuild: generate Module.symvers only when vmlinux exists 2021-05-19 10:12:59 +02:00
index.rst rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig docs: Kconfig/Makefile: add a check for broken ABI files 2020-10-30 13:08:07 +01:00
logo.gif
Makefile A small number of fixes, plus a build tweak to respect the desire for 2020-11-03 09:57:30 -08:00
memory-barriers.txt
SubmittingPatches
watch_queue.rst