Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 07:52:37 +0000 (18:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 07:52:37 +0000 (18:52 +1100)
commit5b4aa8875b145c4edb3745725cd3c1addfb45205
treedd9714e6200452df3a9906f118302b96afbb1af3
parent60bf36e3a8cf265841fd488242666aa223f667bf
parentfc12aa67daba87a5ac43a9d3ae80be2e666e2ef9
Merge branch 'sysctl-next' of git://git./linux/kernel/git/mcgrof/linux.git

# Conflicts:
# include/linux/sched/sysctl.h
# kernel/sysctl.c
include/linux/sched/sysctl.h
kernel/locking/lockdep.c
kernel/rcu/rcu.h
kernel/sched/core.c
kernel/sched/fair.c
kernel/sched/sched.h
kernel/sched/topology.c
kernel/sysctl.c