Greg Kroah-Hartman a17a563d16 Merge 449dc8c970 ("Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline ...

Merges along the way to 5.9-rc1

resolves conflicts in:
	Documentation/ABI/testing/sysfs-class-power
	drivers/power/supply/power_supply_sysfs.c
	fs/crypto/inline_crypt.c

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

2020-08-08 13:07:20 +02:00

..

apparmor

mm, treewide: rename kzfree() to kfree_sensitive()

2020-08-07 11:33:22 -07:00

bpf

bpf: lsm: Initialize the BPF LSM hooks

2020-03-30 01:34:00 +02:00

integrity

Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline

2020-08-07 16:01:35 +02:00

keys

mm, treewide: rename kzfree() to kfree_sensitive()

2020-08-07 11:33:22 -07:00

loadpin

block: move block-related definitions out of fs.h

2020-06-24 09:16:02 -06:00

lockdown

Merge 039aeb9deb ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm") into android-mainline

2020-06-20 09:49:29 +02:00

safesetid

security/safesetid: Replace rcu_swap_protected() with rcu_replace_pointer()

2019-10-30 08:45:57 -07:00

selinux

Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline

2020-08-07 16:01:35 +02:00

smack

Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline

2020-08-07 16:01:35 +02:00

tomoyo

exec: Implement kernel_execve

2020-07-21 08:24:52 -05:00

yama

sysctl: pass kernel pointers to ->proc_handler

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

commoncap.c

Merge 7ae77150d9 ("Merge tag 'powerpc-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux") into android-mainline

2020-06-23 21:47:20 +02:00

device_cgroup.c

device_cgroup: Cleanup cgroup eBPF device filter code

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

inode.c

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

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

Kconfig

bpf: lsm: Initialize the BPF LSM hooks

2020-03-30 01:34:00 +02: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 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline

2020-08-07 16:01:35 +02: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

Merge 5.8-rc4 into android-mainline

2020-07-06 09:05:59 +02:00