diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-02-23 07:14:26 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-02-23 07:14:26 +0100 |
| commit | eebf56b99438eac9c5d705435fd93730099dcabd (patch) | |
| tree | 7dea5f0a7f2a2d65597571f35b2ad9d3913528b1 /kernel.spec | |
| parent | dba5a10bea2d8dd1397e8c655c4c748ddf027cb2 (diff) | |
| parent | a62acee612826cbf53475dfdea946759399a6148 (diff) | |
| download | kernel-eebf56b99438eac9c5d705435fd93730099dcabd.tar.gz kernel-eebf56b99438eac9c5d705435fd93730099dcabd.tar.xz kernel-eebf56b99438eac9c5d705435fd93730099dcabd.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc2.git2.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 7d4b0b5c7..c4d5ce8e4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -618,6 +618,9 @@ Patch313: arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch # 500 - Temp fixes/CVEs etc +# CVE-2018-7273 rhbz 1547384 1547386 +Patch500: floppy-Don-t-print-kernel-addresses-to-log-in-show_f.patch + # 600 - Patches for improved Bay and Cherry Trail device support # Below patches are submitted upstream, awaiting review / merging @@ -1892,6 +1895,9 @@ fi # # %changelog +* Wed Feb 21 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc2.git2.1 +- Linux v4.16-rc2-64-gaf3e79d29555 + * Tue Feb 20 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc2.git1.1 - Linux v4.16-rc2-62-g79c0ef3e85c0 - Reenable debugging options |