]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...
authorIngo Molnar <mingo@kernel.org>
Sun, 23 Apr 2017 09:12:44 +0000 (11:12 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 23 Apr 2017 09:12:44 +0000 (11:12 +0200)
Pull RCU updates from Paul E. McKenney:

 - Documentation updates.

 - Miscellaneous fixes.

 - Parallelize SRCU callback handling (plus overlapping patches).

Signed-off-by: Ingo Molnar <mingo@kernel.org>
12 files changed:
1  2 
drivers/gpu/drm/i915/i915_gem.c
fs/jbd2/journal.c
include/linux/kvm_host.h
include/net/sock.h
mm/rmap.c
net/dccp/ipv4.c
net/dccp/ipv6.c
net/ipv4/tcp_ipv4.c
net/ipv6/tcp_ipv6.c
net/llc/af_llc.c
net/netfilter/nf_conntrack_core.c
net/smc/af_smc.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/rmap.c
Simple merge
diff --cc net/dccp/ipv4.c
Simple merge
diff --cc net/dccp/ipv6.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge