diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-31 08:00:49 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-31 08:00:49 +0100 |
| commit | 35fc3bbb7542c6a07234695e03fa26fd5cb0be23 (patch) | |
| tree | 18dfe2f98e1d309a9be995d90aa23e203963ea27 /kernel.spec | |
| parent | 0648a60b7e84124f0357ab6e6d90c894f16f33b1 (diff) | |
| parent | 465569abadf808e3a083f3b93ded5103b5bcfab2 (diff) | |
| download | kernel-35fc3bbb7542c6a07234695e03fa26fd5cb0be23.tar.gz kernel-35fc3bbb7542c6a07234695e03fa26fd5cb0be23.tar.xz kernel-35fc3bbb7542c6a07234695e03fa26fd5cb0be23.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc7.git0.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc7.git0.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc7.git0.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc7.git0.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 1e8a2f5ca..2b6f3c8ec 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 6 +%global rcrev 7 # 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} @@ -675,6 +675,11 @@ Patch620: 0001-staging-vboxvideo-Fix-reporting-invalid-suggested-of.patch # Headed upstream Patch621: drm-i915-Boost-GPU-clocks-if-we-miss-the-pageflip-s-vblank.patch +# rhbz 1497861, submitted upstream, Cc: Stable +Patch622: 0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch + +Patch623: 0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch + # END OF PATCH DEFINITIONS %endif @@ -2232,6 +2237,15 @@ fi # # %changelog +* Mon Oct 30 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc7.git0.1 +- Linux v4.14-rc7 + +* Mon Oct 30 2017 Justin M. Forbes <jforbes@fedoraproject.org> +- Disable debugging options. + +* Mon Oct 30 2017 Hans de Goede <jwrdegoede@fedoraproject.org> +- Fix for peaq_wmi nul spew (rhbz 1497861) + * Fri Oct 27 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc6.git4.1 - Linux v4.14-rc6-53-g15f859ae5c43 |