Greg Kroah-Hartman bbf615b8e1 Merge 7d6beb71da ("Merge tag 'idmapped-mounts-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux") into android-mainline ...

Steps on the way to 5.12-rc1.

Resolves conflicts in:
	fs/overlayfs/inode.c

Note, incfs is broken here, will mark it as BROKEN in another patch to
make it more obvious.

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

2021-03-06 17:42:01 +01:00

..

apparmor

apparmor: handle idmapped mounts

2021-01-24 14:27:20 +01:00

bpf

bpf: Implement task local storage

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

integrity

Revert "FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr"

2021-03-06 12:51:05 +01:00

keys

KEYS: trusted: Reserve TPM for seal and unseal operations

2021-02-16 10:40:28 +02: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

Merge 7d6beb71da ("Merge tag 'idmapped-mounts-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux") into android-mainline

2021-03-06 17:42:01 +01:00

smack

Revert "FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr"

2021-03-06 12:51:05 +01:00

tomoyo

tomoyo: recognize kernel threads correctly

2021-02-01 11:53:05 +09:00

yama

task_work: cleanup notification modes

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

commoncap.c

Revert "FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr"

2021-03-06 12:51:05 +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

Merge 3a36281a17 ("Merge tag 'perf-tools-for-v5.12-2020-02-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux") into android-mainline

2021-03-06 08:40:52 +01:00

Makefile

…

min_addr.c

…

security.c

Merge tag 'idmapped-mounts-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux

2021-02-23 13:39:45 -08:00