summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-powerpc64le2
-rw-r--r--kernel.spec6
-rw-r--r--sources2
3 files changed, 8 insertions, 2 deletions
diff --git a/config-powerpc64le b/config-powerpc64le
index 03cb3bdd8..8fb979630 100644
--- a/config-powerpc64le
+++ b/config-powerpc64le
@@ -1,3 +1,5 @@
# CONFIG_VIRTUALIZATION is not set
# CONFIG_BPF_JIT is not set
CONFIG_CPU_LITTLE_ENDIAN=y
+
+# CONFIG_CARL9170 is not set
diff --git a/kernel.spec b/kernel.spec
index b076aa1dd..673a77177 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 7
# The git snapshot level
-%define gitrev 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2228,6 +2228,10 @@ fi
# ||----w |
# || ||
%changelog
+* Fri May 30 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc7.git3.1
+- Linux v3.15-rc7-79-gfe45736f4134
+- Disable CARL9170 on ppc64le
+
* Thu May 29 2014 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2014-3917 DoS with syscall auditing (rhbz 1102571 1102715)
diff --git a/sources b/sources
index 4bbba1c25..01932df5e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz
d36baf2d62de5aa61f10a976d00d2d2a perf-man-3.14.tar.gz
60b037372f01a77790531da6c61dd80e patch-3.15-rc7.xz
-c0b1c5432348c03182b8f14bdf76a91b patch-3.15-rc7-git2.xz
+1bcf648d022d3441aa53715d1227d8a2 patch-3.15-rc7-git3.xz