Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict