diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-21 07:05:17 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-21 07:05:17 +0200 |
commit | 7070406c3e64b7af4c0e568732aa620e3338e0c4 (patch) | |
tree | 5cf76ebed44dcac7424adc558fc4aaad6d3e702d /kernel.spec | |
parent | b830a70fa8f6711f29d0448994ec015e10a65b87 (diff) | |
parent | 135abd0c282fbe19d4565c75b6c058d388cfd2bc (diff) | |
download | kernel-7070406c3e64b7af4c0e568732aa620e3338e0c4.tar.gz kernel-7070406c3e64b7af4c0e568732aa620e3338e0c4.tar.xz kernel-7070406c3e64b7af4c0e568732aa620e3338e0c4.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc5.git4.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc5.git4.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc5.git4.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc5.git4.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 13971db1e..066a099da 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 5 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -656,7 +656,6 @@ Patch502: CVE-2017-7477.patch # rhbz 1498016 1498017 Patch503: KEYS-don-t-let-add_key-update-an-uninstantiated-key.patch -Patch504: KEYS-fix-race-between-updating-and-finding-negative-.patch # 600 - Patches for improved Bay and Cherry Trail device support # Below patches are submitted upstream, awaiting review / merging @@ -2233,6 +2232,9 @@ fi # # %changelog +* Fri Oct 20 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc5.git4.1 +- Linux v4.14-rc5-94-g9a27ded2195a + * Thu Oct 19 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc5.git3.1 - Linux v4.14-rc5-31-g73d3393ada4f |