diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-01-13 07:39:15 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-01-13 07:39:15 +0100 |
| commit | 0a98de1f47fc9941d19b13f09c78bc5d09dd0308 (patch) | |
| tree | 6461273aa2a8e7eff3d690fe0d933ea8d17a5989 /kernel.spec | |
| parent | debe16cdcea0c50276ff099393d73a88528ef08a (diff) | |
| parent | 3775d0459a912df24eae8c4fe921714c62ea7e5a (diff) | |
| download | kernel-0a98de1f47fc9941d19b13f09c78bc5d09dd0308.tar.gz kernel-0a98de1f47fc9941d19b13f09c78bc5d09dd0308.tar.xz kernel-0a98de1f47fc9941d19b13f09c78bc5d09dd0308.zip | |
Merge branch 'master' into f23-user-thl-vanilla-rawhidekernel-4.5.0-0.rc0.git1.1.vanilla.knurd.1.fc23
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 9734bfcf2..47f86d6f1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 1 +%global released_kernel 0 # Sign modules on x86. Make sure the config files match this setting if more # architectures are added. @@ -75,7 +75,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -130,7 +130,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -599,13 +599,10 @@ Patch501: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch -Patch503: drm-i915-turn-off-wc-mmaps.patch +# Patch503: drm-i915-turn-off-wc-mmaps.patch Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch -#CVE-2015-7833 rhbz 1270158 1270160 -Patch567: usbvision-fix-crash-on-detecting-device-with-invalid.patch - #rhbz 1287819 Patch570: HID-multitouch-enable-palm-rejection-if-device-imple.patch @@ -641,6 +638,12 @@ Patch620: 0016-i2c-designware-Convert-to-use-unified-device-propert.patch #rhbz 1295646 Patch621: drm-udl-Use-unlocked-gem-unreferencing.patch +#rhbz 1083853 +Patch622: PNP-Add-Broadwell-to-Intel-MCH-size-workaround.patch + +#CVE-2015-7566 rhbz 1296466 1297517 +Patch623: usb-serial-visor-fix-crash-on-detecting-device-witho.patch + # END OF PATCH DEFINITIONS %endif @@ -1763,6 +1766,8 @@ find $RPM_BUILD_ROOT/usr/include \ %{perf_make} DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} install-bin install-traceevent-plugins # remove the 'trace' symlink. rm -f %{buildroot}%{_bindir}/trace +# remove the perf-tips +rm -rf %{buildroot}%{_docdir}/perf-tip # python-perf extension %{perf_make} DESTDIR=$RPM_BUILD_ROOT install-python_ext @@ -2087,6 +2092,17 @@ fi # # %changelog +* Tue Jan 12 2016 Justin M. Forbes <jforbes@fedoraproject.org> +- drop i915 patch to turn off wc mmaps + +* Tue Jan 12 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git1.1 +- Linux v4.4-1175-g03891f9 +- Reenable debugging options. + +* Tue Jan 12 2016 Josh Boyer <jwboyer@fedoraproject.org> +- CVE-2015-7566 usb: visor: Crash on invalid USB dev descriptors (rhbz 1296466 1297517) +- Fix backtrace from PNP conflict on Broadwell (rhbz 1083853) + * Mon Jan 11 2016 Laura Abbott <labbott@redhat.com> - 4.4.0-1 - Linux v4.4 - Disable debugging options. |