diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-20 08:06:59 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-20 08:06:59 +0200 |
commit | da7c2d7b2c1dd6b8b71cae0ae11595bf5faf03d3 (patch) | |
tree | 0f23de152a5ffe2357254c465e8b21be0392bbf8 /kernel.spec | |
parent | 2357cb03ff676c3cfb862b3426314b7aabc64482 (diff) | |
parent | dbbf35c164fe38b0bbf61536396dc2e4b0dbe5ac (diff) | |
download | kernel-4.12.0-0.rc1.git4.1.vanilla.knurd.1.fc24.tar.gz kernel-4.12.0-0.rc1.git4.1.vanilla.knurd.1.fc24.tar.xz kernel-4.12.0-0.rc1.git4.1.vanilla.knurd.1.fc24.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc1.git4.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc1.git4.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc1.git4.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc1.git4.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index e974620e4..a60e48782 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -570,8 +570,6 @@ Patch210: disable-i8042-check-on-apple-mac.patch Patch211: drm-i915-hush-check-crtc-state.patch -# Patch212: drm-i915-turn-off-wc-mmaps.patch - # 300 - ARM patches # a tempory patch for QCOM hardware enablement. Will be gone by F-26 GA @@ -2192,6 +2190,9 @@ fi # # %changelog +* Fri May 19 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc1.git4.1 +- Linux v4.12-rc1-154-g8b4822d + * Thu May 18 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc1.git3.1 - Linux v4.12-rc1-104-gdac94e2 |