diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-08-21 09:30:44 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-08-21 09:32:11 -0400 |
| commit | 2875d27c9a977df8cef028fbf82c505f5a7fd712 (patch) | |
| tree | 87f7520ccc820eb4b975cbdb38595aaf5474b882 /kernel.spec | |
| parent | 663b0b92dace6c68da45cb5c29e342617e0f1be1 (diff) | |
| download | kernel-2875d27c9a977df8cef028fbf82c505f5a7fd712.tar.gz kernel-2875d27c9a977df8cef028fbf82c505f5a7fd712.tar.xz kernel-2875d27c9a977df8cef028fbf82c505f5a7fd712.zip | |
Add patch from Dave Airlie to fix fb cursor vs grub2 gfxterm hang
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 05f65d2c0..39edbfe80 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 @@ -747,6 +747,8 @@ Patch22001: selinux-apply-different-permission-to-ptrace-child.patch #rhbz 836742 Patch22059: uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch +Patch22065: fbcon-fix-race-condition-between-console-lock-and-cursor-timer.patch + # END OF PATCH DEFINITIONS %endif @@ -1437,6 +1439,8 @@ ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch #rhbz 836742 ApplyPatch uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch +ApplyPatch fbcon-fix-race-condition-between-console-lock-and-cursor-timer.patch + # END OF PATCH APPLICATIONS %endif @@ -2299,6 +2303,9 @@ fi # ||----w | # || || %changelog +* Tue Aug 21 2012 Josh Boyer <jwboyer@redhat.com> +- Add patch from Dave Airlie to fix fb cursor vs grub2 gfxterm hang + * Mon Aug 20 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc2.git1.1 - Linux v3.6-rc2-206-g10c63c9 |