summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-generic2
-rw-r--r--kernel.spec8
-rw-r--r--sources2
3 files changed, 8 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index e8d41b795..1bb85ed86 100644
--- a/config-generic
+++ b/config-generic
@@ -4788,7 +4788,7 @@ CONFIG_OPTIMIZE_INLINING=y
# FIXME: This should be x86/ia64 only
# CONFIG_HP_ILO is not set
-# CONFIG_GPIOLIB is not set
+CONFIG_GPIOLIB=y
# CONFIG_PINCTRL is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_PINMUX is not set
diff --git a/kernel.spec b/kernel.spec
index 5056763c9..4ed901f44 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 2
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 7
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2161,6 +2161,10 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Jan 08 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc7.git2.1
+- Linux v3.13-rc7-67-gceb3b02
+- Enable BCMA_DRIVER_GPIO by turning on GPIOLIB everywhere (rhbz 1021098)
+
* Tue Jan 07 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Drop -doc subpackage
diff --git a/sources b/sources
index 9cba7b882..058414914 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
cc6ee608854e0da4b64f6c1ff8b6398c linux-3.12.tar.xz
3eba4fbc64b9fdd16b26692005b5e33b patch-3.13-rc7.xz
-8336a11db3fd6f128b7e9b5b67038c9c patch-3.13-rc7-git1.xz
+7d5ea26028d51611944c199afd382e7b patch-3.13-rc7-git2.xz
a1a1e715cc0c95b4c90d432290b4ee96 perf-man.tar.gz