diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-17 10:18:24 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-17 10:18:24 -0500 |
| commit | 08f431fa3ad32081c754b2ba5346eb1337a63b89 (patch) | |
| tree | 031cba201cd5612ec8a1a64a38d7ee1e73a7030d /kernel.spec | |
| parent | c438599162b0da1365ac1ea1a03e16586fc47e77 (diff) | |
| download | kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.tar.gz kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.tar.xz kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.zip | |
Linux v3.19-7478-g796e1c55717e
- DRM merge
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 0907b479c..7e6b974a7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -556,7 +556,6 @@ Patch1019: Add-sysrq-option-to-disable-secure-boot-mode.patch # nouveau + drm fixes # intel drm is all merged upstream -Patch1825: drm-i915-tame-the-chattermouth-v2.patch Patch1826: drm-i915-hush-check-crtc-state.patch # Quiet boot fixes @@ -1307,7 +1306,6 @@ ApplyPatch Add-sysrq-option-to-disable-secure-boot-mode.patch # Nouveau DRM # Intel DRM -ApplyPatch drm-i915-tame-the-chattermouth-v2.patch ApplyPatch drm-i915-hush-check-crtc-state.patch # Radeon DRM @@ -2221,6 +2219,10 @@ fi # ||----w | # || || %changelog +* Tue Feb 17 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git7.1 +- Linux v3.19-7478-g796e1c55717e +- DRM merge + * Mon Feb 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - CVE-XXXX-XXXX potential memory corruption in vhost/scsi driver (rhbz 1189864 1192079) - CVE-2015-1593 stack ASLR integer overflow (rhbz 1192519 1192520) |