github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
8a8168e343
linux/include
History
Tao Huang 8a8168e343 Merge remote branch 'android12-5.10-2021-08' of https://android.googlesource.com/kernel/common 
* android12-5.10-2021-08: (429 commits)
  ANDROID: Update symbol list for mtk
  ANDROID: scheduler: export task_sched_runtime
  FROMLIST: mm: slub: fix slub_debug disabling for list of slabs
  FROMLIST: mm/madvise: add MADV_WILLNEED to process_madvise()
  ANDROID: Update the exynos symbol list
  FROMGIT: firmware: arm_scmi: Free mailbox channels if probe fails
  ANDROID: GKI: gki_defconfig: Enable CONFIG_NFC
  ANDROID: sched: Make uclamp changes depend on CAP_SYS_NICE
  ANDROID: GKI: update xiaomi symbol list and ABI XML
  ANDROID: ABI: update generic symbol list
  ANDROID: scsi: ufs: Enable CONFIG_SCSI_UFS_HPB
  ANDROID: scsi: ufs: Make CONFIG_SCSI_UFS_HPB compatible with the GKI
  UPSTREAM: arm64: vdso: Avoid ISB after reading from cntvct_el0
  ANDROID: GKI: Disable X86_MCE drivers
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: ABI: update allowed list for exynos
  FROMGIT: sched: Skip priority checks with SCHED_FLAG_KEEP_PARAMS
  FROMGIT: sched: Don't report SCHED_FLAG_SUGOV in sched_getattr()
  FROMGIT: sched/deadline: Fix reset_on_fork reporting of DL tasks
  BACKPORT: FROMGIT: sched: Fix UCLAMP_FLAG_IDLE setting
  ...

Change-Id: I5e0600bb4ccd0333366b016b42332e1e79e56b61

Conflicts:
	drivers/usb/gadget/configfs.c
	include/linux/usb/gadget.h
2021-08-24 20:07:38 +08:00
..
acpi ACPI: scan: Use unique number for instance_no 2021-03-30 14:32:06 +02:00
asm-generic ANDROID: vmlinux.lds.h: Keep .eh_frame with CFI 2021-06-02 21:54:54 +00:00
clocksource rk: revert to v4.19 2021-03-17 18:05:39 +08:00
crypto FROMLIST: crypto: shash - stop comparing function pointers to avoid breaking CFI 2021-06-11 07:49:58 +00:00
drm drm/bridge: dw-mipi-dsi: add support for rockchip kernel logo 2021-08-18 16:44:28 +08:00
dt-bindings dt-bindings: add power-domain header for RK3588 SoCs 2021-08-23 19:17:37 +08:00
keys security: keys: trusted: fix TPM2 authorizations 2021-05-14 09:50:20 +02:00
kunit
kvm rk: revert to v4.19 2021-03-17 18:05:39 +08:00
linux Merge remote branch 'android12-5.10-2021-08' of https://android.googlesource.com/kernel/common 2021-08-24 20:07:38 +08:00
math-emu rk: revert to v4.19 2021-03-17 18:05:39 +08:00
media Merge remote branch 'android12-5.10-2021-08' of https://android.googlesource.com/kernel/common 2021-08-24 20:07:38 +08:00
memory
misc Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-03-17 18:07:51 +08:00
net ANDROID: GKI: add vendor padding variable in struct sock 2021-07-14 20:52:03 -07:00
pcmcia
ras
rdma rk: revert to v4.19 2021-03-17 18:05:39 +08:00
scsi ANDROID: add kabi padding for structures for the android12 release 2021-07-14 20:51:51 -07:00
soc PM / devfreq: rockchip_dmc: Split out some functions into separate file 2021-08-06 20:11:06 +08:00
sound ANDROID: add kabi padding for structures for the android12 release 2021-07-14 20:51:51 -07:00
target scsi: target: core: Add cmd length set before cmd complete 2021-03-17 17:06:25 +01:00
trace Merge remote branch 'android12-5.10-2021-08' of https://android.googlesource.com/kernel/common 2021-08-24 20:07:38 +08:00
uapi Merge remote branch 'android12-5.10-2021-08' of https://android.googlesource.com/kernel/common 2021-08-24 20:07:38 +08:00
vdso rk: revert to v4.19 2021-03-17 18:05:39 +08:00
video rk: revert to v4.19 2021-03-17 18:05:39 +08:00
xen rk: revert to v4.19 2021-03-17 18:05:39 +08:00