summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-05-01 08:32:15 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-05-01 08:35:03 -0400
commit9cf9eb40449bb795df477c26897b879a964dd75f (patch)
tree977e0bd877fa70d93a065619aff0c40597d0ce27
parent310a822ac9e7a63a06bfdcaeee8239e46d24e7a9 (diff)
downloadkernel-9cf9eb40449bb795df477c26897b879a964dd75f.tar.gz
kernel-9cf9eb40449bb795df477c26897b879a964dd75f.tar.xz
kernel-9cf9eb40449bb795df477c26897b879a964dd75f.zip
Linux v3.9-5165-g5f56886
-rw-r--r--Makefile.release1
-rw-r--r--config-armv7-generic1
-rw-r--r--config-armv7-lpae1
-rw-r--r--config-debug1
-rw-r--r--config-generic2
-rw-r--r--config-nodebug1
-rw-r--r--config-x86-generic1
-rw-r--r--kernel.spec9
-rw-r--r--sources2
9 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.release b/Makefile.release
index ee811bac2..6438f8353 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -64,6 +64,7 @@ config-release:
@perl -pi -e 's/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_PER_CPU_MAPS=y/# CONFIG_DEBUG_PER_CPU_MAPS is not set/' config-nodebug
@perl -pi -e 's/CONFIG_TEST_LIST_SORT=y/# CONFIG_TEST_LIST_SORT is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_TEST_STRING_HELPERS=m/# CONFIG_TEST_STRING_HELPERS is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_ATOMIC_SLEEP=y/# CONFIG_DEBUG_ATOMIC_SLEEP is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DETECT_HUNG_TASK=y/# CONFIG_DETECT_HUNG_TASK is not set/' config-nodebug
@perl -pi -e 's/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/' config-nodebug
diff --git a/config-armv7-generic b/config-armv7-generic
index 17411868b..5657830c4 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -468,3 +468,4 @@ CONFIG_PERF_EVENTS=y
# CONFIG_DEBUG_LL is not set
# CONFIG_IRQ_DOMAIN_DEBUG is not set
# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_ARM_DT_BL_CPUFREQ is not set
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 15b0d53cd..b808e31d1 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -47,6 +47,7 @@ CONFIG_SOC_EXYNOS5250=y
CONFIG_SOC_EXYNOS5440=y
CONFIG_MACH_EXYNOS5_DT=y
CONFIG_ARM_EXYNOS_CPUFREQ=y
+# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
CONFIG_SERIAL_SAMSUNG=y
CONFIG_I2C_S3C2410=m
CONFIG_PINCTRL_EXYNOS=y
diff --git a/config-debug b/config-debug
index 43655a1a1..76ac82568 100644
--- a/config-debug
+++ b/config-debug
@@ -100,6 +100,7 @@ CONFIG_KDB_CONTINUE_CATASTROPHIC=0
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_STRING_HELPERS=m
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
diff --git a/config-generic b/config-generic
index b46401ebd..fdee19c6d 100644
--- a/config-generic
+++ b/config-generic
@@ -156,6 +156,7 @@ CONFIG_INFINIBAND_USER_MAD=m
CONFIG_INFINIBAND_USER_ACCESS=m
CONFIG_INFINIBAND_IPATH=m
CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
CONFIG_INFINIBAND_AMSO1100=m
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
CONFIG_INFINIBAND_CXGB3=m
@@ -175,6 +176,7 @@ CONFIG_INFINIBAND_QIB=m
CONFIG_BINFMT_ELF=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_SCRIPT=y
CONFIG_BINFMT_MISC=m
#
diff --git a/config-nodebug b/config-nodebug
index cfabd29c7..33b49ab1a 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -100,6 +100,7 @@ CONFIG_KDB_CONTINUE_CATASTROPHIC=0
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_STRING_HELPERS=m
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
diff --git a/config-x86-generic b/config-x86-generic
index 099a3f98d..58f8ed309 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -102,6 +102,7 @@ CONFIG_X86_ACPI_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ_CPB=y
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
CONFIG_X86_P4_CLOCKMOD=m
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
diff --git a/kernel.spec b/kernel.spec
index bfb4b6404..de2c818ef 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 7
+%define gitrev 8
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -638,7 +638,7 @@ Patch100: taint-vbox.patch
Patch110: vmbugon-warnon.patch
-Patch200: debug-bad-pte-dmi.patch
+#atch200: debug-bad-pte-dmi.patch
Patch201: debug-bad-pte-modules.patch
Patch390: defaults-acpi-video.patch
@@ -1300,7 +1300,7 @@ ApplyPatch taint-vbox.patch
ApplyPatch vmbugon-warnon.patch
-ApplyPatch debug-bad-pte-dmi.patch
+#plyPatch debug-bad-pte-dmi.patch
ApplyPatch debug-bad-pte-modules.patch
# Architecture patches
@@ -2290,6 +2290,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed May 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git8.1
+- Linux v3.9-5165-g5f56886
+
* Tue Apr 30 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git7.1
- Linux v3.9-4597-g8c55f14
diff --git a/sources b/sources
index 516514058..4fa567ce3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
4348c9b6b2eb3144d601e87c19d5d909 linux-3.9.tar.xz
-91a1d78c658627d2252700269db5f224 patch-3.9-git7.xz
+8555c80da6ab79e0d3db0ff3c9dfd20f patch-3.9-git8.xz