summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-05-10 08:57:25 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-05-10 09:31:48 -0400
commitd937c7d4ce6dd808a44d72230c550643419e05e8 (patch)
tree98b48c5530d73f26bc77e15cd8c63c07157123b7
parent6391f4231e94834812a2e34b20dd5b0fdac48b65 (diff)
downloadkernel-d937c7d4ce6dd808a44d72230c550643419e05e8.tar.gz
kernel-d937c7d4ce6dd808a44d72230c550643419e05e8.tar.xz
kernel-d937c7d4ce6dd808a44d72230c550643419e05e8.zip
Linux v3.9-12316-g70eba42
-rw-r--r--Makefile.release1
-rw-r--r--config-armv72
-rw-r--r--config-debug2
-rw-r--r--config-generic3
-rw-r--r--config-nodebug2
-rw-r--r--kernel.spec5
-rw-r--r--sources2
7 files changed, 14 insertions, 3 deletions
diff --git a/Makefile.release b/Makefile.release
index 6438f8353..22fc8ac5e 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -70,6 +70,7 @@ config-release:
@perl -pi -e 's/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_KMEMLEAK=y/# CONFIG_DEBUG_KMEMLEAK is not set/' config-nodebug
@perl -pi -e 's/CONFIG_MAC80211_MESSAGE_TRACING=y/# CONFIG_MAC80211_MESSAGE_TRACING is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_XFS_WARN=y/# CONFIG_XFS_WARN is not set/' config-nodebug
@# Undo anything that make extremedebug might have set
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
diff --git a/config-armv7 b/config-armv7
index 47a1837b1..2525ec4e2 100644
--- a/config-armv7
+++ b/config-armv7
@@ -13,7 +13,7 @@ CONFIG_ARCH_SUNXI=y
CONFIG_ARCH_TEGRA=y
CONFIG_ARCH_U8500=y
CONFIG_ARCH_VEXPRESS_CA9X4=y
-CONFIG_ARCH_VEXPRESS_DT=y
+CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_WM8850 is not set
CONFIG_ARCH_ZYNQ=y
diff --git a/config-debug b/config-debug
index 76ac82568..ab3f68a5d 100644
--- a/config-debug
+++ b/config-debug
@@ -64,6 +64,8 @@ CONFIG_DEBUG_CREDENTIALS=y
CONFIG_EXT4_DEBUG=y
+CONFIG_XFS_WARN=y
+
CONFIG_DEBUG_PERF_USE_VMALLOC=y
# off in both production debug and nodebug builds,
diff --git a/config-generic b/config-generic
index 7156161c9..3160c13f0 100644
--- a/config-generic
+++ b/config-generic
@@ -3681,6 +3681,7 @@ CONFIG_JFS_FS=m
CONFIG_JFS_POSIX_ACL=y
CONFIG_JFS_SECURITY=y
CONFIG_XFS_FS=m
+# CONFIG_XFS_WARN is not set
# CONFIG_XFS_DEBUG is not set
# CONFIG_XFS_RT is not set
CONFIG_XFS_QUOTA=y
@@ -3852,6 +3853,8 @@ CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS_POSIX_ACL=y
# Maybe see if we want this on for debug kernels?
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
CONFIG_CONFIGFS_FS=y
diff --git a/config-nodebug b/config-nodebug
index 33b49ab1a..5b0d69558 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -68,6 +68,8 @@ CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
CONFIG_EXT4_DEBUG=y
+CONFIG_XFS_WARN=y
+
CONFIG_DEBUG_PERF_USE_VMALLOC=y
CONFIG_JBD2_DEBUG=y
diff --git a/kernel.spec b/kernel.spec
index 59e699c8e..c32e0c7a2 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 24
+%define gitrev 25
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2237,6 +2237,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri May 10 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git25.1
+- Linux v3.9-12316-g70eba42
+
* Thu May 09 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git24.1
- Linux v3.9-12070-g8cbc95e
diff --git a/sources b/sources
index 03bae79bf..149108f35 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
4348c9b6b2eb3144d601e87c19d5d909 linux-3.9.tar.xz
-debe429cf6a3eef328807abca676a5d0 patch-3.9-git24.xz
+43b3dae05e34214e94216d055f692bd5 patch-3.9-git25.xz