diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-07 19:52:52 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-07 19:52:52 +0200 |
commit | 5bae90a8be827a033db42e0cdfd3caecae789c04 (patch) | |
tree | da007056a946f2288a1486dfb8bc432cd56f5686 /kernel.spec | |
parent | 0a44e3cbba9c0945b798a28f19b159a327085842 (diff) | |
parent | 7e2bb119001d20dc48dc373d05d7180cb526c898 (diff) | |
download | kernel-5bae90a8be827a033db42e0cdfd3caecae789c04.tar.gz kernel-5bae90a8be827a033db42e0cdfd3caecae789c04.tar.xz kernel-5bae90a8be827a033db42e0cdfd3caecae789c04.zip |
Merge remote-tracking branch 'origin/f26' into f26-user-thl-vanilla-fedorakernel-4.11.4-300.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/kernel.spec b/kernel.spec index 4ca38df8f..f2e556852 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,7 +44,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 302 +%global baserelease 300 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -58,7 +58,7 @@ Summary: The Linux kernel %define stable_rc 0 # Do we have a -stable update to apply? -%define stable_update 3 +%define stable_update 4 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -656,27 +656,12 @@ Patch668: CVE-2017-7477.patch Patch669: 0001-SUNRPC-Refactor-svc_set_num_threads.patch Patch670: 0002-NFSv4-Fix-callback-server-shutdown.patch -#CVE-2017-8890 rhbz 1450972 -Patch671: 0001-dccp-tcp-do-not-inherit-mc_list-from-parent.patch - -#CVE-2017-9074 rhbz 1452679 -Patch672: 0001-ipv6-Prevent-overrun-when-parsing-v6-header-options.patch - -#CVE-2017-9075 rhbz 1452691 -Patch673: 0001-sctp-do-not-inherit-ipv6_-mc-ac-fl-_list-from-parent.patch - -#CVE-2017-9076 CVE-2017-9077 rhbz 1452688 1452744 -Patch674: 0001-ipv6-dccp-do-not-inherit-ipv6_mc_list-from-parent.patch - #Fix broadwell issues Patch675: drm-i915-Do-not-drop-pagetables-when-empty.patch # rhbz 1455780 Patch676: 2-2-nvme-Quirk-APST-on-Intel-600P-P3100-devices.patch -# Networking fix reported on bodhi -Patch678: net-v2-ip6_tunnel-ip6_gre-fix-setting-of-DSCP-on-encapsulated-packets.patch - # rhbz 1458222 1458499 # As linked from http://marc.info/?l=linux-netdev&m=149336766030175&w=2 Patch679: actual_udpencap_fix.patch @@ -2253,6 +2238,9 @@ fi # # %changelog +* Wed Jun 07 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.4-300 +- Linux v4.11.4 + * Wed Jun 7 2017 Peter Robinson <pbrobinson@fedoraproject.org> - Add upstream patch set to fix WiFi on HiKey - Patch set to fix Raspberry Pi PCM Audio clocking |