summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-09-17 09:48:32 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-09-17 09:48:32 -0400
commitdd6c13b6b2b29d56b407217442c53f24db31fa9d (patch)
treedec346613ab2f3a6ffb7e81c6863cb0b0de0fa32 /kernel.spec
parentcf23086f03db3db081d5bfab14d6d92e2d67c289 (diff)
downloadkernel-dd6c13b6b2b29d56b407217442c53f24db31fa9d.tar.gz
kernel-dd6c13b6b2b29d56b407217442c53f24db31fa9d.tar.xz
kernel-dd6c13b6b2b29d56b407217442c53f24db31fa9d.zip
Linux v3.17-rc5-24-g37504a3be90b
- Fix vmwgfx header include (rhbz 1138759)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 90dcaa7fb..44c20a357 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 5
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -613,6 +613,9 @@ Patch26016: HID-wacom-Add-support-for-the-Cintiq-Companion.patch
Patch26019: psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
Patch26020: psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
+#rhbz 1138759
+Patch26021: drm-vmwgfx-Fix-drm.h-include.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1337,6 +1340,9 @@ ApplyPatch HID-wacom-Add-support-for-the-Cintiq-Companion.patch
ApplyPatch psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
ApplyPatch psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
+#rhbz 1138759
+ApplyPatch drm-vmwgfx-Fix-drm.h-include.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2205,6 +2211,10 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Sep 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git2.1
+- Linux v3.17-rc5-24-g37504a3be90b
+- Fix vmwgfx header include (rhbz 1138759)
+
* Tue Sep 16 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git1.1
- Linux v3.17-rc5-13-g2324067fa9a4
- Reenable debugging options.