summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-05-02 15:42:10 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-05-02 15:42:10 -0400
commit9c6ca1788c0fe07eea0cc9072f7eadfc85c89a3f (patch)
tree2966d73a522cdb76fcfa8f730fd83379b511601b
parent646b52f3a2a42b6e1eb5413859d7d856b334b06a (diff)
downloadkernel-9c6ca1788c0fe07eea0cc9072f7eadfc85c89a3f.tar.gz
kernel-9c6ca1788c0fe07eea0cc9072f7eadfc85c89a3f.tar.xz
kernel-9c6ca1788c0fe07eea0cc9072f7eadfc85c89a3f.zip
Linux v3.9-8153-g5a148af
-rw-r--r--config-powerpc-generic2
-rw-r--r--config-powerpc641
-rw-r--r--config-powerpc64p71
-rw-r--r--kernel.spec5
-rw-r--r--sources2
5 files changed, 9 insertions, 2 deletions
diff --git a/config-powerpc-generic b/config-powerpc-generic
index b6df88ea8..2dcab485d 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -385,6 +385,8 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_OF_DISPLAY_TIMING is not set
# CONFIG_OF_VIDEOMODE is not set
+# CONFIG_POWERNV_MSI is not set
+
CONFIG_POWER_RESET_GPIO=y
CONFIG_FB_SSD1307=m
CONFIG_INPUT_PWM_BEEPER=m
diff --git a/config-powerpc64 b/config-powerpc64
index d0e0aab5b..c2fc1a153 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -12,6 +12,7 @@ CONFIG_PPC_MAPLE=y
CONFIG_PPC_PSERIES=y
CONFIG_PPC_PMAC=y
CONFIG_PPC_POWERNV=y
+CONFIG_POWERNV_MSI=y
CONFIG_PPC_POWERNV_RTAS=y
# CONFIG_PPC_PASEMI is not set
# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index 285d9fff9..424a83ea0 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -8,6 +8,7 @@ CONFIG_POWER7_CPU=y
CONFIG_PPC_PSERIES=y
# CONFIG_PPC_PMAC is not set
CONFIG_PPC_POWERNV=y
+CONFIG_POWERNV_MSI=y
CONFIG_PPC_POWERNV_RTAS=y
# CONFIG_PPC_PASEMI is not set
# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
diff --git a/kernel.spec b/kernel.spec
index 134bd0f01..2afd69b03 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 12
+%define gitrev 13
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2266,6 +2266,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu May 02 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git13.1
+- Linux v3.9-8153-g5a148af
+
* Thu May 02 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git12.1
- Linux v3.9-7992-g99c6bcf
diff --git a/sources b/sources
index 5d7670f0f..a6e1712aa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
4348c9b6b2eb3144d601e87c19d5d909 linux-3.9.tar.xz
-3aab7d769a8df9f94999c42896e13b58 patch-3.9-git12.xz
+87c320a09dfc606233ba1da2b878338c patch-3.9-git13.xz