Merge branch 'linus' into core/rcu