[kernel] Linux v3.14-rc1-86-g9343224

Josh Boyer jwboyer at fedoraproject.org
Fri Feb 7 10:02:12 UTC 2014


commit 58fa16ea43056ac79a692f2ae38a9ff737787096
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Fri Feb 7 04:42:35 2014 -0500

    Linux v3.14-rc1-86-g9343224

 config-generic    |    3 +-
 kernel.spec       |   11 ++---
 sources           |    2 +-
 tang-numa-1.patch |   83 ---------------------------------
 tang-numa-2.patch |  132 -----------------------------------------------------
 5 files changed, 7 insertions(+), 224 deletions(-)
---
diff --git a/config-generic b/config-generic
index 4aea53e..170003e 100644
--- a/config-generic
+++ b/config-generic
@@ -128,7 +128,8 @@ CONFIG_MMC=m
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
+# https://lists.fedoraproject.org/pipermail/kernel/2014-February/004889.html
+CONFIG_MMC_UNSAFE_RESUME=y
 # CONFIG_MMC_CLKGATE is not set
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
diff --git a/kernel.spec b/kernel.spec
index 7aff1b8..75d3a9f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -630,9 +630,6 @@ Patch25191: kernfs-oops-fix.patch
 Patch25192: imx-hdmi-fix.patch
 Patch25193: fix-exynos-hdmi-build.patch
 
-Patch25194: tang-numa-1.patch
-Patch25915: tang-numa-2.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1285,9 +1282,6 @@ ApplyPatch kernfs-oops-fix.patch
 ApplyPatch imx-hdmi-fix.patch
 ApplyPatch fix-exynos-hdmi-build.patch
 
-ApplyPatch tang-numa-1.patch
-ApplyPatch tang-numa-2.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2067,6 +2061,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Feb 07 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.14.0-0.rc1.git3.1
+- Linux v3.14-rc1-86-g9343224
+
 * Thu Feb 06 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.14.0-0.rc1.git2.1
 - Linux v3.14-rc1-54-gef42c58
 
diff --git a/sources b/sources
index 84e7818..583b521 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 0ecbaf65c00374eb4a826c2f9f37606f  linux-3.13.tar.xz
 732d1952898b28d5ccc264cad77b0619  perf-man-3.13.tar.gz
 c3ef4db4edbf6ca3a01a0c392dd048b9  patch-3.14-rc1.xz
-4c99048a5468ebd2628398a37257c00c  patch-3.14-rc1-git2.xz
+c2bf432f4279d2dd6f9774b06ab312ce  patch-3.14-rc1-git3.xz


More information about the scm-commits mailing list