Merge branch 'linus' into locking/urgent, to pick up fixes