3.10-stable patches

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

diff --git a/queue-3.10/arm-dts-add-missing-cpu-address-cell-values.patch b/queue-3.10/arm-dts-add-missing-cpu-address-cell-values.patch
index 1a849e922acf82633fa5f146de74e395f8b7c538..f03ddf649dee4c06e0431c10b8da75b1af950409 100644 (file)
--- a/queue-3.10/arm-dts-add-missing-cpu-address-cell-values.patch
+++ b/queue-3.10/arm-dts-add-missing-cpu-address-cell-values.patch
@@ -19,11 +19,15 @@ Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
 Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
-diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
-index abdf1c83..f57ffbc9 100644
+---
+ arch/arm/boot/dts/sama5d3.dtsi   |    2 ++
+ arch/arm/boot/dts/sun4i-a10.dtsi |    2 ++
+ arch/arm/boot/dts/sun5i-a13.dtsi |    2 ++
+ 3 files changed, 6 insertions(+)
+
 --- a/arch/arm/boot/dts/sama5d3.dtsi
 +++ b/arch/arm/boot/dts/sama5d3.dtsi
-@@ -38,6 +38,8 @@
+@@ -35,6 +35,8 @@
                ssc1 = &ssc1;
        };
        cpus {
@@ -32,8 +36,6 @@ index abdf1c83..f57ffbc9 100644
                cpu@0 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a5";
-diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
-index 39a8f615..06ef8b62 100644
 --- a/arch/arm/boot/dts/sun4i-a10.dtsi
 +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
 @@ -16,6 +16,8 @@
@@ -45,8 +47,6 @@ index 39a8f615..06ef8b62 100644
                cpu@0 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a8";
-diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
-index 00a2637d..d2852547 100644
 --- a/arch/arm/boot/dts/sun5i-a13.dtsi
 +++ b/arch/arm/boot/dts/sun5i-a13.dtsi
 @@ -17,6 +17,8 @@

diff --git a/queue-3.10/pci_ids-add-pci-device-id-functions-3-and-4-for-newer-f15h-models.patch b/queue-3.10/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.10/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.10/series b/queue-3.10/series
index 2d36ab676576928f6786a168d80fce844057ed09..39b6c88d26555e814cfa9586d8b9310b0fe65d99 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -46,6 +46,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