Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 RAS changes from Ingo Molnar:

 - Add an Intel CMCI hotplug fix

 - Add AMD family 16h EDAC support

 - Make the AMD MCE banks code more flexible for virtual environments

* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  amd64_edac: Add Family 16h support
  x86/mce: Rework cmci_rediscover() to play well with CPU hotplug
  x86, MCE, AMD: Use MCG_CAP MSR to find out number of banks on AMD
  x86, MCE, AMD: Replace shared_bank array with is_shared_bank() helper

diff --cc arch/x86/kernel/amd_nb.c
index 3684129be94795423e5bcd32622f820820b01ab3,f1d0a1446d3ac2e79736514c5aa42b4055e58456..3048ded1b5983a9a3e7f511fc30066f672721383
--- 1/arch/x86/kernel/amd_nb.c
--- 2/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@@ -24,8 -25,9 +25,9 @@@ const struct pci_device_id amd_nb_misc_
  };
  EXPORT_SYMBOL(amd_nb_misc_ids);
  
 -static struct pci_device_id amd_nb_link_ids[] = {
 +static const struct pci_device_id amd_nb_link_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
+       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
        {}
  };
  

diff --cc include/linux/pci_ids.h
Simple merge