summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-12-05 09:42:28 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2013-12-05 09:42:28 -0500
commitd5539dfec65d6d3e899cc5dcff8640092396efa0 (patch)
treee6cfb0d9afb1482daeee895bf2d193042ebf9b09
parent78ba2bd9614541e48bb65ad5134d1c5571f18dec (diff)
downloadkernel-d5539dfec65d6d3e899cc5dcff8640092396efa0.tar.gz
kernel-d5539dfec65d6d3e899cc5dcff8640092396efa0.tar.xz
kernel-d5539dfec65d6d3e899cc5dcff8640092396efa0.zip
Linux v3.13-rc2-215-g53c6de5
- Enable PR kvm module on ppc64 (rhbz 1038541)
-rw-r--r--config-powerpc644
-rw-r--r--kernel.spec6
-rw-r--r--sources2
3 files changed, 8 insertions, 4 deletions
diff --git a/config-powerpc64 b/config-powerpc64
index f4bb2def4..4cefd1ae1 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -141,8 +141,8 @@ CONFIG_RCU_FANOUT=64
CONFIG_CMA=y
# CONFIG_CMA_DEBUG is not set
CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=y
-# CONFIG_KVM_BOOK3S_64_PR is not set
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KVM_BOOK3S_64_PR=m
# CONFIG_KVM_EXIT_TIMING is not set
CONFIG_KVM_XICS=y
diff --git a/kernel.spec b/kernel.spec
index f1d63e87e..b85453729 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 2
# The git snapshot level
-%define gitrev 3
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2190,6 +2190,10 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Dec 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git4.1
+- Linux v3.13-rc2-215-g53c6de5
+- Enable PR kvm module on ppc64 (rhbz 1038541)
+
* Wed Dec 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git3.1
- Linux v3.13-rc2-208-g8ecffd7
diff --git a/sources b/sources
index 8af6dd128..6da8f98d4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
cc6ee608854e0da4b64f6c1ff8b6398c linux-3.12.tar.xz
ed069580489aca6ddafa04d171e5c098 patch-3.13-rc2.xz
-d804a77fa5639004451d08008e4f3fee patch-3.13-rc2-git3.xz
+adcab14e91d1190cf350e71067703e5b patch-3.13-rc2-git4.xz