Skip to content
Commit ecf1f014 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/rcu' into core/locking, to prepare the kernel/locking/ file move



There are conflicts in lockdep.c due to RCU changes, and also the RCU
tree changes kernel/Makefile - so pre-merge it to ease the moving of
locking related .c files to kernel/locking/.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 97c53b40 0e95c69b
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment