diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-26 07:58:40 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-26 07:58:40 +0200 |
| commit | 348012821f7014b45577b6c34b7f895cd345c63a (patch) | |
| tree | 3ae03f632d74cc113c0752725e8ae75ac25dd9a9 /kernel.spec | |
| parent | 3d1f9b96026f06f1d6130a975ad9988c33dc3b0d (diff) | |
| parent | b43cd9971349391d46e3c71da0b041c7099d6c9a (diff) | |
| download | kernel-348012821f7014b45577b6c34b7f895cd345c63a.tar.gz kernel-348012821f7014b45577b6c34b7f895cd345c63a.tar.xz kernel-348012821f7014b45577b6c34b7f895cd345c63a.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc0.git8.1.vanilla.knurd.1.fc22
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 1739bf88b..f28dee2b1 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 6 +%define gitrev 8 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -570,8 +570,6 @@ Patch482: Add-option-to-automatically-enforce-module-signature.patch Patch483: efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch -Patch484: efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch - Patch485: efi-Add-EFI_SECURE_BOOT-bit.patch Patch486: hibernate-Disable-in-a-signed-modules-environment.patch @@ -583,7 +581,7 @@ Patch488: Add-an-EFI-signature-blob-parser-and-key-loader.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 +Patch489: KEYS-Add-a-system-blacklist-keyring.patch Patch490: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch @@ -2155,6 +2153,15 @@ fi # # %changelog +* Wed May 25 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git8.1 +- Linux v4.6-10530-g28165ec +- ARM SoC, asm-generic, nfsd, ext4, spi, mtd, xen, merges + +* Tue May 24 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.7.0-0.rc0.git7.1 +- Linux v4.6-10203-g84787c572d40 +- Enable CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE (rhbz 1339281) +- Fixup SB patchset to work with upstream changes + * Mon May 23 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git6.1 - Linux v4.6-8907-g7639dad - trace, f2fs, btrfs, rtc, mailbox, akpm, staging, driver core, char, usb, |