diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-25 13:09:36 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-25 13:09:36 -0400 |
commit | 9d4f1f002935c24a9e8b5459726d01b702445285 (patch) | |
tree | b12721e26255fc94fd11c3d41ca52f46c62c0ac8 /kernel.spec | |
parent | 243dfca335a9a6fc0a9c4d66dfd5f5c0739a5ba3 (diff) | |
download | kernel-9d4f1f002935c24a9e8b5459726d01b702445285.tar.gz kernel-9d4f1f002935c24a9e8b5459726d01b702445285.tar.xz kernel-9d4f1f002935c24a9e8b5459726d01b702445285.zip |
Linux v4.0-rc5-53-gc875f421097a
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 24d00fa84..4e7a0200f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -40,7 +40,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 3 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -68,7 +68,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 4.%{upstream_sublevel}.0 %endif @@ -615,8 +615,6 @@ Patch26139: Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch #rhbz 1196825 Patch26140: security-yama-Remove-unnecessary-selects-from-Kconfi.patch -Patch26141: mfd-rtsx_usb-prevent-DMA-from-stack.patch - #CVE-2014-8159 rhbz 1181166 1200950 Patch26167: IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch @@ -633,6 +631,8 @@ Patch26173: drm-i915-Don-t-try-to-reference-the-fb-in-get_initia.patch #rhbz 1203584 Patch26174: Input-ALPS-fix-max-coordinates-for-v5-and-v7-protoco.patch +#atch26175: intel.patch + # END OF PATCH DEFINITIONS %endif @@ -1359,8 +1359,6 @@ ApplyPatch Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch #rhbz 1196825 ApplyPatch security-yama-Remove-unnecessary-selects-from-Kconfi.patch -ApplyPatch mfd-rtsx_usb-prevent-DMA-from-stack.patch - #CVE-2014-8159 rhbz 1181166 1200950 ApplyPatch IB-core-Prevent-integer-overflow-in-ib_umem_get-addr.patch @@ -1377,6 +1375,8 @@ ApplyPatch drm-i915-Don-t-try-to-reference-the-fb-in-get_initia.patch #rhbz 1203584 ApplyPatch Input-ALPS-fix-max-coordinates-for-v5-and-v7-protoco.patch +#pplyPatch intel.patch + # END OF PATCH APPLICATIONS %endif @@ -2227,6 +2227,9 @@ fi # # %changelog +* Wed Mar 25 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git2.1 +- Linux v4.0-rc5-53-gc875f421097a + * Tue Mar 24 2015 Josh Boyer <jwboyer@fedoraproject.org> - Fix ALPS v5 and v7 trackpads (rhbz 1203584) |