Greg Kroah-Hartman 1e5e020b08 Merge 3b80dee70e ("Merge tag 'sched-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline ...

Steps on the way to 5.11-rc1

Resolves merge issues in:
	kernel/sched/sched.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If5b00273202785ed39c5f46dfb92dd7791499cda

2021-01-13 13:03:04 +01:00

..

apparmor

apparmor: remove duplicate macro list_entry_is_head()

2020-12-15 22:46:19 -08:00

bpf

bpf: Implement task local storage

2020-11-06 08:08:37 -08:00

integrity

Merge 3b80dee70e ("Merge tag 'sched-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline

2021-01-13 13:03:04 +01:00

keys

Merge tag 'net-next-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

2020-12-15 13:22:29 -08:00

loadpin

LSM: Add "contents" flag to kernel_read_file hook

2020-10-05 13:37:03 +02:00

lockdown

ANDROID: Revert "security,lockdown,selinux: implement SELinux lockdown"

2020-12-29 19:50:45 +00:00

safesetid

LSM: SafeSetID: Fix warnings reported by test bot

2020-10-13 09:17:36 -07:00

selinux

ANDROID: Revert "security,lockdown,selinux: implement SELinux lockdown"

2020-12-29 19:50:45 +00:00

smack

Merge 3b80dee70e ("Merge tag 'sched-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline

2021-01-13 13:03:04 +01:00

tomoyo

tomoyo: Fix typo in comments.

2020-12-06 13:44:57 +09:00

yama

task_work: cleanup notification modes

2020-10-17 15:05:30 -06:00

commoncap.c

Merge 92dbc9dedc ("Merge tag 'ovl-update-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs") into android-mainline

2020-12-21 12:17:55 +01:00

device_cgroup.c

device_cgroup: Fix RCU list debugging warning

2020-08-20 11:25:03 -07:00

inode.c

Revert "ANDROID: vfs: Add permission2 for filesystems with per mount permissions"

2020-05-29 08:49:28 +02:00

Kconfig

Replace HTTP links with HTTPS ones: security

2020-08-06 12:00:05 -07:00

Kconfig.hardening

security: allow using Clang's zero initialization for stack variables

2020-06-16 02:06:23 -07:00

lsm_audit.c

ANDROID: Revert "security,lockdown,selinux: implement SELinux lockdown"

2020-12-29 19:50:45 +00:00

Makefile

device_cgroup: Cleanup cgroup eBPF device filter code

2020-04-13 14:41:54 -04:00

min_addr.c

sysctl: pass kernel pointers to ->proc_handler

2020-04-27 02:07:40 -04:00

security.c

Revert "Revert "security,lockdown,selinux: implement SELinux lockdown""

2020-12-17 09:21:11 +01:00