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 --combined arch/x86/kernel/amd_nb.c
index 3684129,f1d0a14..3048ded
--- 1/arch/x86/kernel/amd_nb.c
--- 2/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@@ -20,12 -20,14 +20,14 @@@ const struct pci_device_id amd_nb_misc_
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
        {}
  };
  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) },
        {}
  };
  
@@@ -81,7 -83,6 +83,6 @@@ int amd_cache_northbridges(void
                        next_northbridge(link, amd_nb_link_ids);
          }
  
-       /* some CPU families (e.g. family 0x11) do not support GART */
        if (boot_cpu_data.x86 == 0xf || boot_cpu_data.x86 == 0x10 ||
            boot_cpu_data.x86 == 0x15)
                amd_northbridges.flags |= AMD_NB_GART;

diff --combined include/linux/pci_ids.h
index a80f9e6,9b3b858..2b85c52
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -524,6 -524,8 +524,8 @@@
  #define PCI_DEVICE_ID_AMD_15H_NB_F3   0x1603
  #define PCI_DEVICE_ID_AMD_15H_NB_F4   0x1604
  #define PCI_DEVICE_ID_AMD_15H_NB_F5   0x1605
+ #define PCI_DEVICE_ID_AMD_16H_NB_F3   0x1533
+ #define PCI_DEVICE_ID_AMD_16H_NB_F4   0x1534
  #define PCI_DEVICE_ID_AMD_CNB17H_F3   0x1703
  #define PCI_DEVICE_ID_AMD_LANCE               0x2000
  #define PCI_DEVICE_ID_AMD_LANCE_HOME  0x2001
@@@ -1604,7 -1606,6 +1606,7 @@@
  #define PCI_SUBDEVICE_ID_KEYSPAN_SX2  0x5334
  
  #define PCI_VENDOR_ID_MARVELL         0x11ab
 +#define PCI_VENDOR_ID_MARVELL_EXT     0x1b4b
  #define PCI_DEVICE_ID_MARVELL_GT64111 0x4146
  #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430
  #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460