Merge branch 'locking/arch-atomic' of git://git.kernel.org/pub/scm/linux/kernel/git...