diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-10-07 09:04:53 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-10-07 09:05:44 +0200 |
| commit | c3e235eb4ca45add65769a3e590fe8c8c9e43963 (patch) | |
| tree | cca754d7a4997334447b6b6921d4dbf14aca0bab | |
| parent | e1f148e3602f3057d7973f2f93e11284d6be3099 (diff) | |
| download | kernel-c3e235eb4ca45add65769a3e590fe8c8c9e43963.tar.gz kernel-c3e235eb4ca45add65769a3e590fe8c8c9e43963.tar.xz kernel-c3e235eb4ca45add65769a3e590fe8c8c9e43963.zip | |
Linux v5.3.4kernel-5.3.4-350.vanilla.knurd.1.fc31
| -rw-r--r-- | kernel.spec | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index b15e01132..d66909fd4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -58,15 +58,11 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -<<<<<<< HEAD -%define stable_update 3 +%define stable_update 4 # Is it a -stable RC? %define stable_rc 0 -======= -%define stable_update 4 ->>>>>>> origin/f31 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -1825,8 +1821,6 @@ fi # # %changelog -<<<<<<< HEAD -======= * Mon Oct 7 2019 Peter Robinson <pbrobinson@fedoraproject.org> 5.3.4-300 - Linux v5.3.4 @@ -1834,7 +1828,6 @@ fi - Fixes for RockPro64 - Fixes for Jetson-TX series devices ->>>>>>> origin/f31 * Thu Oct 03 2019 Justin M. Forbes <jforbes@fedoraproject.org> - Fix CVE-2019-17052 CVE-2019-17053 CVE-2019-17054 CVE-2019-17055 CVE-2019-17056 (rhbz 1758239 1758240 1758242 1758243 1758245 1758246 1758248 1758249 1758256 1758257) |