Linux v3.9.6

This commit is contained in:
Josh Boyer 2013-06-13 14:40:28 -04:00
parent c98aa694c6
commit 73be2dc284
3 changed files with 6 additions and 28 deletions

View File

@ -1,13 +0,0 @@
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 8df0c5a..d111c86 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -703,7 +703,7 @@ static int hp_wmi_rfkill_setup(struct platform_device *device)
}
rfkill_init_sw_state(gps_rfkill,
hp_wmi_get_sw_state(HPWMI_GPS));
- rfkill_set_hw_state(bluetooth_rfkill,
+ rfkill_set_hw_state(gps_rfkill,
hp_wmi_get_hw_state(HPWMI_GPS));
err = rfkill_register(gps_rfkill);
if (err)

View File

@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
%global baserelease 201
%global baserelease 200
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -74,7 +74,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
%define stable_update 5
%define stable_update 6
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@ -753,9 +753,6 @@ Patch25001: i7300_edac_single_mode_fixup.patch
#rhbz 927469
Patch25007: fix-child-thread-introspection.patch
#rhbz 964367
Patch25023: hp-wmi-fix-incorrect-rfkill-set-hw-state.patch
#rhbz 948262
Patch25024: intel_iommu-Downgrade-the-warning-if-enabling-irq-remapping-fails.patch
@ -777,9 +774,6 @@ Patch25034: b43-stop-format-string-leaking-into-error-msgs.patch
#CVE-2013-2851 rhbz 969515 971662
Patch25035: block-do-not-pass-disk-names-as-format-strings.patch
# Fix for build failure on powerpc in 3.9.5
Patch25037: powerpc-3.9.5-fix.patch
#CVE-2013-2164 rhbz 973100 973109
Patch25038: cdrom-use-kzalloc-for-failing-hardware.patch
@ -1488,9 +1482,6 @@ ApplyPatch VMX-x86-handle-host-TSC-calibration-failure.patch
#rhbz 927469
ApplyPatch fix-child-thread-introspection.patch
#rhbz 964367
ApplyPatch hp-wmi-fix-incorrect-rfkill-set-hw-state.patch
#rhbz 948262
ApplyPatch intel_iommu-Downgrade-the-warning-if-enabling-irq-remapping-fails.patch
@ -1512,9 +1503,6 @@ ApplyPatch b43-stop-format-string-leaking-into-error-msgs.patch
#CVE-2013-2851 rhbz 969515 971662
ApplyPatch block-do-not-pass-disk-names-as-format-strings.patch
# Fix for build failure on powerpc in 3.9.5
ApplyPatch powerpc-3.9.5-fix.patch
#CVE-2013-2164 rhbz 973100 973109
ApplyPatch cdrom-use-kzalloc-for-failing-hardware.patch
@ -2377,6 +2365,9 @@ fi
# ||----w |
# || ||
%changelog
* Thu Jun 13 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.6-200
- Linux v3.9.6
* Wed Jun 12 2013 Josh Boyer <jwboyer@redhat.com>
- Fix KVM divide by zero error (rhbz 969644)
- Add fix for rt5390/rt3290 regression (rhbz 950735)

View File

@ -1,2 +1,2 @@
4348c9b6b2eb3144d601e87c19d5d909 linux-3.9.tar.xz
aa22187ae5cd482a69097e9e59244491 patch-3.9.5.xz
897cffc5167a561b38c6748e7f0a4215 patch-3.9.6.xz