Merge 'x86/cpu' to pick up dependent bits