[kernel/stabilization] Linux v3.14.1

Josh Boyer jwboyer at fedoraproject.org
Mon Apr 14 19:11:47 UTC 2014


commit f24a071320975b836574d9fc18b15b8294fce3a4
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Mon Apr 14 15:11:16 2014 -0400

    Linux v3.14.1

 3.14.1-rc1.patch | 1982 ------------------------------------------------------
 kernel.spec      |    9 +-
 sources          |    1 +
 3 files changed, 5 insertions(+), 1987 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index efc7566..cf519aa 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 at fedoraproject.org>
+- Linux v3.14.1
+
 * Mon Apr 14 2014 Hans de Goede <hdegoede at redhat.com>
 - Add min/max quirks for various new Thinkpad touchpads (rhbz 1085582 1085697)
 
diff --git a/sources b/sources
index 3d6940b..924114b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
 d36baf2d62de5aa61f10a976d00d2d2a  perf-man-3.14.tar.gz
+2526eb95793ecc1c22d7e1428ef23cdc  patch-3.14.1.xz


More information about the scm-commits mailing list