summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2017-12-11 09:21:58 -0800
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2017-12-11 09:21:58 -0800
commit1dfa55e01987288d847220b8c027204871440ed1 (patch)
treebc66ae468702fbd62b2fb10147d18de9a87edb20 /kernel
parentdc259accec0845ddf56e87337c0b211026eca0ae (diff)
parent584c005951866792d552f21f7445e8104ce10f9c (diff)
parent84b12b752f41cd3d25d75692c2145d816e42926c (diff)
parent3a5db0b108e0a40f08c2bcff6a675dbf632b91e0 (diff)
parent29d3939084583b26a5487be64b9523e61468f1be (diff)
downloadlinux-1dfa55e01987288d847220b8c027204871440ed1.tar.gz
linux-1dfa55e01987288d847220b8c027204871440ed1.tar.bz2
linux-1dfa55e01987288d847220b8c027204871440ed1.zip
Merge branches 'cond_resched.2017.12.04a', 'dyntick.2017.11.28a', 'fixes.2017.12.11a', 'srbd.2017.12.05a' and 'torture.2017.12.11a' into HEAD
cond_resched.2017.12.04a: Convert cond_resched_rcu_qs() to cond_resched() dyntick.2017.11.28a: Make RCU dynticks handle interrupts from NMI fixes.2017.12.11a: Miscellaneous fixes srbd.2017.12.05a: Remove now-redundant smp_read_barrier_depends() torture.2017.12.11a: Torture-testing update