From 6a50f368784f29b0772f265a05b9e395bb2c23ff Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 30 Jun 2015 13:01:28 -0400 Subject: Linux v4.1-11355-g6aaf0da8728c - Add patch to fix KVM sleeping in atomic issue (rhbz 1237143) - Fix errant with_perf disable that removed perf entirely (rhbz 1237266) --- kernel.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index cedef2a55..4dbfbec88 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -237,7 +237,6 @@ Summary: The Linux kernel %ifnarch %{power64} %define with_bootwrapper 0 %define with_sparse 0 -%define with_perf 0 %endif # Per-arch tweaks @@ -597,6 +596,8 @@ Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch Patch503: drm-i915-turn-off-wc-mmaps.patch +Patch504: sched-kvm-Fix-KVM-preempt_notifier-usage.patch + # END OF PATCH DEFINITIONS @@ -1267,6 +1268,8 @@ ApplyPatch firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch ApplyPatch drm-i915-turn-off-wc-mmaps.patch +ApplyPatch sched-kvm-Fix-KVM-preempt_notifier-usage.patch + # END OF PATCH APPLICATIONS @@ -2132,11 +2135,19 @@ fi # # %changelog +* Tue Jun 30 2015 Josh Boyer - 4.2.0-0.rc0.git3.1 +- Linux v4.1-11355-g6aaf0da8728c +- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143) +- Fix errant with_perf disable that removed perf entirely (rhbz 1237266) + +* Tue Jun 30 2015 Peter Robinson +- Minor Aarch64 updates and cleanups +- Enable initial support for hi6220 + * Mon Jun 29 2015 Josh Boyer - 4.1.0-0.rc0.git2.1 - Linux v4.1-11235-gc63f887bdae8 - Reenable debugging options. - * Fri Jun 26 2015 Peter Robinson - Reorganisation and cleanup of the powerpc configs -- cgit