Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...