Re: [PATCH 4/5] x86/intel: Aggregate microserver naming

[Ingo Molnar]

* Ingo Molnar <mi...@kernel.org> wrote:

>  arch/x86/kernel/cpu/common.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Plus this too:

---
 drivers/edac/sb_edac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 37746b045e18..f743502ca9b7 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -3429,7 +3429,7 @@ static const struct x86_cpu_id sbridge_cpuids[] = {
        INTEL_CPU_FAM6(IVYBRIDGE_X,       pci_dev_descr_ibridge_table),
        INTEL_CPU_FAM6(HASWELL_X,         pci_dev_descr_haswell_table),
        INTEL_CPU_FAM6(BROADWELL_X,       pci_dev_descr_broadwell_table),
-       INTEL_CPU_FAM6(BROADWELL_XEON_D,  pci_dev_descr_broadwell_table),
+       INTEL_CPU_FAM6(BROADWELL_D,       pci_dev_descr_broadwell_table),
        INTEL_CPU_FAM6(XEON_PHI_KNL,      pci_dev_descr_knl_table),
        INTEL_CPU_FAM6(XEON_PHI_KNM,      pci_dev_descr_knl_table),
        { }