summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-04-14 15:11:16 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-04-14 15:11:16 -0400
commitf24a071320975b836574d9fc18b15b8294fce3a4 (patch)
treecf808e0a4c0cfb847803f945f5fc915b2d31af56 /kernel.spec
parentb2fa49b7ae8e340e5616d1f8ca09eb898493baf7 (diff)
downloadkernel-f24a071320975b836574d9fc18b15b8294fce3a4.tar.gz
kernel-f24a071320975b836574d9fc18b15b8294fce3a4.tar.xz
kernel-f24a071320975b836574d9fc18b15b8294fce3a4.zip
Linux v3.14.1
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index efc7566f8..cf519aa49 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -74,7 +74,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -653,8 +653,6 @@ Patch1826: drm-i915-hush-check-crtc-state.patch
# NFSv4
# patches headed upstream
-Patch12015: 3.14.1-rc1.patch
-
Patch12016: disable-i8042-check-on-apple-mac.patch
Patch14000: hibernate-freeze-filesystems.patch
@@ -1357,8 +1355,6 @@ ApplyPatch drm-i915-hush-check-crtc-state.patch
# Radeon DRM
# Patches headed upstream
-ApplyPatch 3.14.1-rc1.patch
-
ApplyPatch disable-i8042-check-on-apple-mac.patch
# FIXME: REBASE
@@ -2215,6 +2211,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Apr 14 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Linux v3.14.1
+
* Mon Apr 14 2014 Hans de Goede <hdegoede@redhat.com>
- Add min/max quirks for various new Thinkpad touchpads (rhbz 1085582 1085697)