]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branches 'doc.2017.08.17a', 'fixes.2017.08.17a', 'hotplug.2017.07.25b', 'misc...
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Thu, 17 Aug 2017 15:10:04 +0000 (08:10 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Thu, 17 Aug 2017 15:10:04 +0000 (08:10 -0700)
doc.2017.08.17a: Documentation updates.
fixes.2017.08.17a: RCU fixes.
hotplug.2017.07.25b: CPU-hotplug updates.
misc.2017.08.17a: Miscellaneous fixes outside of RCU (give or take conflicts).
spin_unlock_wait_no.2017.08.17a: Remove spin_unlock_wait().
srcu.2017.07.27c: SRCU updates.
torture.2017.07.24c: Torture-test updates.

1  2  3  4  5  6  7 
include/linux/rcupdate.h
include/linux/srcutree.h
kernel/exit.c
kernel/rcu/rcutorture.c
kernel/rcu/srcutree.c
kernel/rcu/tree.c
kernel/rcu/tree.h
kernel/rcu/tree_plugin.h
kernel/sched/core.c

Simple merge
Simple merge
diff --cc kernel/exit.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge