summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-04-18 07:38:02 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-04-18 07:38:02 -0400
commit2ea0fc7ba80a19cb70be5961978b4d072109541e (patch)
tree9c11e07fd34a751ac7ce255be6b38f5811e73cef
parent4f60176946559ae67f6b3fc91e023aea42b5ae88 (diff)
downloadkernel-2ea0fc7ba80a19cb70be5961978b4d072109541e.tar.gz
kernel-2ea0fc7ba80a19cb70be5961978b4d072109541e.tar.xz
kernel-2ea0fc7ba80a19cb70be5961978b4d072109541e.zip
Linux v3.15-rc1-137-g81cef0fe19e0
-rw-r--r--config-generic1
-rw-r--r--kernel.spec5
-rw-r--r--sources2
3 files changed, 6 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index 2f814a1b3..c4add6f67 100644
--- a/config-generic
+++ b/config-generic
@@ -2740,6 +2740,7 @@ CONFIG_IPMI_HANDLER=m
CONFIG_IPMI_DEVICE_INTERFACE=m
CONFIG_IPMI_WATCHDOG=m
CONFIG_IPMI_SI=m
+# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
CONFIG_IPMI_POWEROFF=m
#
diff --git a/kernel.spec b/kernel.spec
index 3ad8677f9..f50b43448 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 3
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2064,6 +2064,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Apr 18 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc1.git4.1
+- Linux v3.15-rc1-137-g81cef0fe19e0
+
* Thu Apr 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc1.git3.1
- Linux v3.15-rc1-113-g6ca2a88ad820
- Build perf with unwind support via libdw (rhbz 1025603)
diff --git a/sources b/sources
index 5474c3cc6..94f2cbf3e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz
d36baf2d62de5aa61f10a976d00d2d2a perf-man-3.14.tar.gz
13e450bb569cfad7c246f0746a7f3217 patch-3.15-rc1.xz
-41993cb298e49dfe3e75844d8f6a3de9 patch-3.15-rc1-git3.xz
+9fd252a3af5b8585254a730d0ad08af0 patch-3.15-rc1-git4.xz