Merge branch 'core/locking' into core/urgent

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc mm/mmap.c
Simple merge