Merge branch 'linus' into locking/core, to resolve conflicts