Merge branch 'work.sysctl' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...
authorDaniel Borkmann <daniel@iogearbox.net>
Tue, 28 Apr 2020 19:20:20 +0000 (21:20 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 28 Apr 2020 19:23:38 +0000 (21:23 +0200)
Pull in Christoph Hellwig's series that changes the sysctl's ->proc_handler
methods to take kernel pointers instead. It gets rid of the set_fs address
space overrides used by BPF. As per discussion, pull in the feature branch
into bpf-next as it relates to BPF sysctl progs.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20200427071508.GV23230@ZenIV.linux.org.uk/T/
1  2 
kernel/bpf/cgroup.c
kernel/events/core.c
kernel/sched/core.c
mm/hugetlb.c
net/ipv4/devinet.c
net/ipv6/addrconf.c

Simple merge
Simple merge
Simple merge
diff --cc mm/hugetlb.c
Simple merge
Simple merge
Simple merge