Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1