summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-11-17 11:20:21 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2013-11-17 11:20:21 -0500
commitab2a11bf7e8baa25b38a408f94b4b2875bb0f0a6 (patch)
treeda5029e045eaf3a203b0c2bba109df680ddfd74b
parent6494f2c3b13d79f6705faceb0efde9029bd56bbf (diff)
downloadkernel-ab2a11bf7e8baa25b38a408f94b4b2875bb0f0a6.tar.gz
kernel-ab2a11bf7e8baa25b38a408f94b4b2875bb0f0a6.tar.xz
kernel-ab2a11bf7e8baa25b38a408f94b4b2875bb0f0a6.zip
Linux v3.12-10087-g1213959
- Update s390x config from Dan Horák
-rw-r--r--config-s390x3
-rw-r--r--kernel.spec6
-rw-r--r--sources2
3 files changed, 8 insertions, 3 deletions
diff --git a/config-s390x b/config-s390x
index f9f1f82d8..0da596510 100644
--- a/config-s390x
+++ b/config-s390x
@@ -247,6 +247,7 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_INPUT_MISC is not set
+# CONFIG_SERIO is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_AUXDISPLAY is not set
@@ -278,4 +279,4 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
# CONFIG_FMC is not set
-CONFIG_CRASH=m
+# CONFIG_CRASH is not set
diff --git a/kernel.spec b/kernel.spec
index 7243ea20d..7387aafce 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 5
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2215,6 +2215,10 @@ fi
# ||----w |
# || ||
%changelog
+* Sun Nov 17 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git6.1
+- Linux v3.12-10087-g1213959
+- Update s390x config from Dan Horák
+
* Sat Nov 16 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git5.1
- Linux v3.12-9888-gf63c482
diff --git a/sources b/sources
index 3c72736cd..0ef3520d2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
cc6ee608854e0da4b64f6c1ff8b6398c linux-3.12.tar.xz
-5949525d241ffdab192e73aa5dcd7450 patch-3.12-git5.xz
+c9b08ff012d65e9fdf9f95890872807a patch-3.12-git6.xz