summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-07-05 22:13:49 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2017-07-05 22:13:49 +0200
commit47717dc901c378af37172e9e75e97f9b28d7999b (patch)
tree1bb4963f11a5c1d06c0b3ca792a863a953abb017 /kernel.spec
parent9b3462958198145d54fbe169777422e25c94608f (diff)
parent1fba72eb717b35fd45fe23434f790956ab7569f2 (diff)
downloadkernel-47717dc901c378af37172e9e75e97f9b28d7999b.tar.gz
kernel-47717dc901c378af37172e9e75e97f9b28d7999b.tar.xz
kernel-47717dc901c378af37172e9e75e97f9b28d7999b.zip
Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedorakernel-4.11.9-200.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 8dbe76bc3..37cc0ade2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -58,7 +58,7 @@ Summary: The Linux kernel
%define stable_rc 0
# Do we have a -stable update to apply?
-%define stable_update 8
+%define stable_update 9
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -641,10 +641,6 @@ Patch867: 0002-NFSv4-Fix-callback-server-shutdown.patch
# rhbz 1455780
Patch676: 2-2-nvme-Quirk-APST-on-Intel-600P-P3100-devices.patch
-# rhbz 1458222 1458499
-# As linked from http://marc.info/?l=linux-netdev&m=149336766030175&w=2
-Patch679: actual_udpencap_fix.patch
-
# rhbz 1459272
Patch680: 0001-platform-x86-thinkpad_acpi-guard-generic-hotkey-case.patch
Patch681: 0002-platform-x86-thinkpad_acpi-add-mapping-for-new-hotke.patch
@@ -2219,6 +2215,9 @@ fi
#
#
%changelog
+* Wed Jul 05 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.9-200
+- Linux v4.11.9
+
* Thu Jun 29 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.8-200
- Linux v4.11.8