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 | |
parent | 2357cb03ff676c3cfb862b3426314b7aabc64482 (diff) | |
parent | dbbf35c164fe38b0bbf61536396dc2e4b0dbe5ac (diff) | |
download | kernel-da7c2d7b2c1dd6b8b71cae0ae11595bf5faf03d3.tar.gz kernel-da7c2d7b2c1dd6b8b71cae0ae11595bf5faf03d3.tar.xz kernel-da7c2d7b2c1dd6b8b71cae0ae11595bf5faf03d3.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
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel.spec | 7 | ||||
-rw-r--r-- | sources | 2 |
3 files changed, 6 insertions, 5 deletions
@@ -1 +1 @@ -dac94e29110cd606dec37673644caf2cf6fd1dde +8b4822de59d5d9919b9b045183a36c673ce20b73 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 @@ -1,4 +1,4 @@ SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 SHA512 (patch-4.12-rc1.xz) = e6144938e8368d2c9dd2a05c68a3f73c2122088a1a09c7c3a63b4f16c4a77b2267f102324f3ecb20101b645b4613cfd24b8907048c76bceb9c2b7a0795e43c84 -SHA512 (patch-4.12-rc1-git3.xz) = a32898ccefb216909d10a5808b0a99fd4b907424f1e0a7d62929d41e5cedbe1d56a6964e02d20d8606f36a8387a8b34c1439bfa239eba725241b93c725dea33f +SHA512 (patch-4.12-rc1-git4.xz) = d4c5f03e356ca050aa62dd77a834685e281cb1ffce196b09730d87cc274993bfca02787a051c175484571204c9e36b397035c23430b8172952ca341d9e888793 |