diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-06-11 08:01:13 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-06-11 08:05:05 -0400 |
| commit | bec80f249c5b9b2a59d359bb917204ea2f83cf66 (patch) | |
| tree | aaa714b2bab847b00d7df2d07597f90fa5e713b6 /kernel.spec | |
| parent | be25d944564ce1377cf9622730389963151d0b86 (diff) | |
| download | kernel-bec80f249c5b9b2a59d359bb917204ea2f83cf66.tar.gz kernel-bec80f249c5b9b2a59d359bb917204ea2f83cf66.tar.xz kernel-bec80f249c5b9b2a59d359bb917204ea2f83cf66.zip | |
Add two upstream commits to fix flaky iwlwifi (rhbz 825491)
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index caad5aea..87cbd921 100644 --- a/kernel.spec +++ b/kernel.spec @@ -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 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -740,6 +740,10 @@ Patch22000: weird-root-dentry-name-debug.patch #selinux ptrace child permissions Patch22001: selinux-apply-different-permission-to-ptrace-child.patch +#rhbz 825491 +Patch22023: iwlwifi-disable-the-buggy-chain-extension-feature-in-HW.patch +Patch22024: iwlwifi-dont-mess-up-the-SCD-when-removing-a-key.patch + # END OF PATCH DEFINITIONS %endif @@ -1426,6 +1430,10 @@ ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch #Highbank clock functions ApplyPatch highbank-export-clock-functions.patch +#rhbz 825491 +ApplyPatch iwlwifi-disable-the-buggy-chain-extension-feature-in-HW.patch +ApplyPatch iwlwifi-dont-mess-up-the-SCD-when-removing-a-key.patch + # END OF PATCH APPLICATIONS %endif @@ -2276,6 +2284,9 @@ fi # ||----w | # || || %changelog +* Mon Jun 11 2012 Josh Boyer <jwboyer@redhat.com> +- Add two upstream commits to fix flaky iwlwifi (rhbz 825491) + * Sun Jun 10 2012 Peter Robinson <pbrobinson@fedoraproject.org> - Temporarily disable ARM imx kernel due to missing clk patches - Add patch to fix OMAP build |