diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-07 17:39:29 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-07 17:39:29 +0100 |
commit | 454e7e6cc8f6ec1ca49611972d9f024bb3128db8 (patch) | |
tree | becd5a1fa97b93f0b8788087a0acd2283b181c43 /kernel.spec | |
parent | 721a7ba6a26425f5c9af350f92005d89155d09f1 (diff) | |
parent | cbf9a4853ae920d61ed056da9d90f6e679c74308 (diff) | |
download | kernel-454e7e6cc8f6ec1ca49611972d9f024bb3128db8.tar.gz kernel-454e7e6cc8f6ec1ca49611972d9f024bb3128db8.tar.xz kernel-454e7e6cc8f6ec1ca49611972d9f024bb3128db8.zip |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc7.git1.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc7.git1.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc7.git1.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 0950f1b06..97613f308 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 3 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -616,6 +616,10 @@ Patch853: 0001-Work-around-for-gcc7-and-arm64.patch #CVE-2017-2596 rhbz 1417812 1417813 Patch854: kvm-fix-page-struct-leak-in-handle_vmon.patch +#CVE-2017-5897 rhbz 1419848 1419851 +Patch855: ip6_gre-fix-ip6gre_err-invalid-reads.patch + + # END OF PATCH DEFINITIONS %endif @@ -2189,6 +2193,15 @@ fi # # %changelog +* Tue Feb 07 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc7.git1.1 +- Linux v4.10-rc7-29-g8b1b41e +- Reenable debugging options. +- CVE-2017-5897 ip6_gre: Invalid reads in ip6gre_err (rhbz 1419848 1419851) + +* Mon Feb 06 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc7.git0.1 +- Disable debugging options. +- Linux v4.10-rc7 + * Fri Feb 03 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc6.git3.1 - Linux v4.10-rc6-110-g34e00ac |