i915: Fix a mismerge in 3.7.y that leads to divide-by-zero in i915_update_wm

This commit is contained in:
Adam Jackson 2013-02-18 13:45:40 -05:00
parent ba9cd28694
commit 65a226a1b6
1 changed files with 6 additions and 0 deletions

View File

@ -711,6 +711,8 @@ Patch1825: drm-i915-dp-stfu.patch
Patch1826: drm-i915-tv-detect-hush.patch
# d-i-n backport for https://bugzilla.redhat.com/show_bug.cgi?id=901951
Patch1827: drm-i915-lvds-reclock-fix.patch
# Fix a mismerge in 3.7.y
Patch1828: drm-i915-Fix-up-mismerge-of-3490ea5d-in-3.7.y.patch
# Quiet boot fixes
# silence the ACPI blacklist code
@ -1462,6 +1464,7 @@ ApplyOptionalPatch drm-intel-next.patch
ApplyPatch drm-i915-dp-stfu.patch
ApplyPatch drm-i915-tv-detect-hush.patch
ApplyPatch drm-i915-lvds-reclock-fix.patch
ApplyPatch drm-i915-Fix-up-mismerge-of-3490ea5d-in-3.7.y.patch
# silence the ACPI blacklist code
ApplyPatch linux-2.6-silence-acpi-blacklist.patch
@ -2399,6 +2402,9 @@ fi
# ||----w |
# || ||
%changelog
* Mon Feb 18 2013 Adam Jackson <ajax@redhat.com
- i915: Fix a mismerge in 3.7.y that leads to divide-by-zero in i915_update_wm
* Fri Feb 15 2013 Josh Boyer <jwboyer@redhat.com>
- CVE-2013-0290 net: infinite loop in __skb_recv_datagram (rhbz 911479 911473)