3.11-stable patches

added patches:
	pci_ids-add-pci-device-id-functions-3-and-4-for-newer-f15h-models.patch

diff --git a/queue-3.11/pci_ids-add-pci-device-id-functions-3-and-4-for-newer-f15h-models.patch b/queue-3.11/pci_ids-add-pci-device-id-functions-3-and-4-for-newer-f15h-models.patch
new file mode 100644 (file)
index 0000000..94df2f4
--- /dev/null
+++ b/queue-3.11/pci_ids-add-pci-device-id-functions-3-and-4-for-newer-f15h-models.patch
@@ -0,0 +1,31 @@
+From 6bdaa63c2957ac04e8d596880f732b79f9c06c3c Mon Sep 17 00:00:00 2001
+From: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
+Date: Fri, 2 Aug 2013 17:43:02 -0500
+Subject: pci_ids: Add PCI device ID functions 3 and 4 for newer F15h models.
+
+From: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
+
+commit 6bdaa63c2957ac04e8d596880f732b79f9c06c3c upstream.
+
+Add PCI device IDs for AMD F15h, model 30h. They will be used in
+amd_nb.c and amd64_edac.c
+
+Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/pci_ids.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -518,6 +518,8 @@
+ #define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303
+ #define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304
+ #define PCI_DEVICE_ID_AMD_15H_M10H_F3 0x1403
++#define PCI_DEVICE_ID_AMD_15H_M30H_NB_F3 0x141d
++#define PCI_DEVICE_ID_AMD_15H_M30H_NB_F4 0x141e
+ #define PCI_DEVICE_ID_AMD_15H_NB_F0   0x1600
+ #define PCI_DEVICE_ID_AMD_15H_NB_F1   0x1601
+ #define PCI_DEVICE_ID_AMD_15H_NB_F2   0x1602

diff --git a/queue-3.11/series b/queue-3.11/series
index f1c672274e4770581c683d83163a2630e387bf2b..bf698aa82aa3db69410ba2ef140909733314597e 100644 (file)
--- a/queue-3.11/series
+++ b/queue-3.11/series
@@ -50,6 +50,7 @@ asoc-wm8960-fix-pll-register-writes.patch
 asoc-mc13783-add-spi-errata-fix.patch
 x86-smap-handle-csum_partial_copy_-_user.patch
 introduce-save_altstack_ex-to-unbreak-x86-smap.patch
+pci_ids-add-pci-device-id-functions-3-and-4-for-newer-f15h-models.patch
 x86-amd_nb-clarify-f15h-model-30h-gart-and-l3-support.patch
 x86-mce-pay-no-attention-to-f-bit-in-mcacod-when-parsing-uc-errors.patch
 sched-x86-optimize-switch_mm-for-multi-threaded-workloads.patch