diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-21 07:56:01 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-21 07:56:01 +0200 |
| commit | a7a0c90031acf1cd1e7bd777bda70e1738c805c9 (patch) | |
| tree | 9188e551ff78c6423cfdf95240226ed368bb482f /kernel.spec | |
| parent | 89f8c3ffa504e07b9ce529acf90c4bfd22a440a4 (diff) | |
| parent | 8a052bf240d0b95d9c255ca9291a0669e5e28ac5 (diff) | |
| download | kernel-a7a0c90031acf1cd1e7bd777bda70e1738c805c9.tar.gz kernel-a7a0c90031acf1cd1e7bd777bda70e1738c805c9.tar.xz kernel-a7a0c90031acf1cd1e7bd777bda70e1738c805c9.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git5.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc0.git5.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc0.git5.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc0.git5.1.vanilla.knurd.1.fc22
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index 0e508fdb5..aa273c948 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -579,7 +579,10 @@ Patch487: Add-EFI-signature-data-types.patch Patch488: Add-an-EFI-signature-blob-parser-and-key-loader.patch -Patch489: KEYS-Add-a-system-blacklist-keyring.patch +# This doesn't apply. It seems like it could be replaced by +# https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=5ac7eace2d00eab5ae0e9fdee63e38aee6001f7c +# which has an explicit line about blacklisting +# Patch489: KEYS-Add-a-system-blacklist-keyring.patch Patch490: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch @@ -623,13 +626,8 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch #CVE-2016-4482 rhbz 1332931 1332932 Patch706: USB-usbfs-fix-potential-infoleak-in-devio.patch -#CVE-2016-4569 rhbz 1334643 1334645 -Patch714: ALSA-timer-Fix-leak-in-SNDRV_TIMER_IOCTL_PARAMS.patch -Patch715: ALSA-timer-Fix-leak-in-events-via-snd_timer_user_cca.patch -Patch716: ALSA-timer-Fix-leak-in-events-via-snd_timer_user_tin.patch - -#CVE-2016-3713 rhbz 1332139 1336410 -Patch717: KVM-MTRR-remove-MSR-0x2f8.patch +#CVE-2016-4440 rhbz 1337806 1337807 +Patch719: kvm-vmx-more-complete-state-update-on-APICv-on-off.patch # END OF PATCH DEFINITIONS @@ -2159,6 +2157,16 @@ fi # # %changelog +* Fri May 20 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git5.1 +- Linux v4.6-6148-g03b979d +- Docs, i2c, md, iommu, sound, pci, pinctrl, dmaengine, kvm, security merges + +* Fri May 20 2016 Josh Boyer <jwboyer@fedoraproject.org> +- CVE-2016-4440 kvm: incorrect state leading to APIC register access (rhbz 1337806 1337807) + +* Fri May 20 2016 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM cleanups, enable Tegra USB-3 controller + * Thu May 19 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git4.1 - Linux v4.6-5028-g2600a46 - trace, audit, input, media, scsi, armsoc merges |