[PATCH -v2 0/5] Further sanitize INTEL_FAM6 naming

[Peter Zijlstra]

Lots of variation has crepts in; time to collapse the lot again.

I'm reposting because the version Ingo applied and partially fixed up still
generates build bot failure.