diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-07 07:31:49 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-07 07:31:49 +0100 |
commit | 02f9b62488caa488585514bdf193832579ff599d (patch) | |
tree | 2d45caa76efb3fd528a5d4c98bc46c3ac15629b4 /kernel.spec | |
parent | 46fd3ce1fc414f6b9bb4f7bdfea24ef51d549b26 (diff) | |
parent | 92bd3b07e7670fed35cc1218e18be3395bc8ec57 (diff) | |
download | kernel-02f9b62488caa488585514bdf193832579ff599d.tar.gz kernel-02f9b62488caa488585514bdf193832579ff599d.tar.xz kernel-02f9b62488caa488585514bdf193832579ff599d.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index 1b2de2c30..c8d1e77e2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 7 +%global rcrev 8 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,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 0 +%define debugbuildsenabled 1 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -628,9 +628,6 @@ Patch310: qcom-msm89xx-fixes.patch # https://patchwork.kernel.org/patch/9831825/ # https://patchwork.kernel.org/patch/9833721/ -# http://www.spinics.net/lists/dri-devel/msg132235.html -Patch320: bcm283x-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch - # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/ Patch321: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch @@ -651,9 +648,6 @@ Patch335: arm-exynos-fix-usb3.patch # 500 - Temp fixes/CVEs etc -# CVE-2017-7477 rhbz 1445207 1445208 -Patch502: CVE-2017-7477.patch - # rhbz 1498016 1498017 #Patch503: KEYS-don-t-let-add_key-update-an-uninstantiated-key.patch @@ -680,6 +674,13 @@ Patch622: 0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch Patch623: 0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch +# rhbz 1509461 +Patch624: v3-1-2-Input-synaptics-rmi4---RMI4-can-also-use-SMBUS-version-3.patch +Patch625: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch + +# rhbz 1490803 +Patch626: 1-2-kvm-vmx-Reinstate-support-for-CPUs-without-virtual-NMI.patch + # END OF PATCH DEFINITIONS %endif @@ -2237,6 +2238,16 @@ fi # # %changelog +* Mon Nov 06 2017 Laura Abbott <labbott@redhat.com> +- Patches for ThinkPad X1 Carbon Gen5 Touchpad (rhbz 1509461) +- Fix for KVM regression on some machines (rhbz 1490803) + +* Mon Nov 06 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc8.git0.1 +- Linux v4.14-rc8 + +* Mon Nov 06 2017 Justin M. Forbes <jforbes@fedoraproject.org> +- Disable debugging options. + * Fri Nov 03 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc7.git4.1 - Linux v4.14-rc7-129-g81ca2caefc6d |