diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-04 19:57:17 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-04 19:57:17 +0200 |
commit | a7191cda67be0bf9b70761f3bbe1682f40f6d31b (patch) | |
tree | ec34e50d0db23a08e9b0260d4c0adc7097bd75c7 /kernel.spec | |
parent | 69d1be1f0ca6008948af4201d0aa7edf86b9394f (diff) | |
parent | 05e55297ee7dac97581503cd45f381a6f994717a (diff) | |
download | kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc24.tar.gz kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc24.tar.xz kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc24.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index 763794885..af859cded 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -558,9 +558,6 @@ Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..pa # Upstream fixes for i2c/serial/ethernet MAC addresses Patch435: bcm283x-fixes.patch -# https://lists.freedesktop.org/archives/dri-devel/2017-February/133823.html -Patch436: vc4-fix-vblank-cursor-update-issue.patch - Patch437: bcm283x-hdmi-audio.patch # https://www.spinics.net/lists/arm-kernel/msg554183.html @@ -591,11 +588,6 @@ Patch487: Add-EFI-signature-data-types.patch 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 - Patch490: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch Patch491: MODSIGN-Support-not-importing-certs-from-db.patch @@ -2206,6 +2198,9 @@ fi # # %changelog +* Thu May 04 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git3.1 +- Linux v4.11-7650-ga1be8ed + * Wed May 03 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git2.1 - Linux v4.11-4395-g89c9fea |