Merge tag 'v3.18-rc1' into x86/urgent