summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-06-09 10:03:09 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-06-09 10:03:09 -0400
commitff66a4e962842bfb5a8628322a7468fc1571db9f (patch)
treedc60979c16ccf94d4256940ca9f47e95ef535b82
parent7ac8101a19da5626651caee5d53b2f222887ea10 (diff)
downloadkernel-ff66a4e962842bfb5a8628322a7468fc1571db9f.tar.gz
kernel-ff66a4e962842bfb5a8628322a7468fc1571db9f.tar.xz
kernel-ff66a4e962842bfb5a8628322a7468fc1571db9f.zip
Linux v3.5-rc2
-rw-r--r--config-generic1
-rw-r--r--kernel.spec7
-rw-r--r--sources2
3 files changed, 7 insertions, 3 deletions
diff --git a/config-generic b/config-generic
index 7ead5e13b..35bc91939 100644
--- a/config-generic
+++ b/config-generic
@@ -4304,6 +4304,7 @@ CONFIG_PTP_1588_CLOCK=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
# CONFIG_MDIO_GPIO is not set
# CONFIG_KEYBOARD_GPIO is not set
diff --git a/kernel.spec b/kernel.spec
index b01cf546a..6ed4d59f7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 3
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -93,7 +93,7 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 1
+%define rcrev 2
# The git snapshot level
%define gitrev 0
# Set rpm version accordingly
@@ -2278,6 +2278,9 @@ fi
# ||----w |
# || ||
%changelog
+* Sat Jun 09 2012 Josh Boyer <jwboyer@redhat.com> - 3.5.0-0.rc2.git0.1
+- Linux v3.5-rc2
+
* Fri Jun 08 2012 Josh Boyer <jwboyer@redhat.com>
- Enable HV assisted KVM on ppc64
diff --git a/sources b/sources
index cee861917..bb4eda3e0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
967f72983655e2479f951195953e8480 linux-3.4.tar.xz
-22d85130ece50214e6d7a05db5e15466 patch-3.5-rc1.xz
+b465d27e5472446d2b03c3dd7d1d8bb9 patch-3.5-rc2.xz