Merge branch 'linus' into x86/fpu, to pick up fixes before applying new changes