summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-05-18 08:20:17 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2018-05-18 08:20:17 +0200
commit292617f45e429e7ad7c2c63f2116e330bf02a5dc (patch)
tree12ee6b3e80287455b9bf339e48c90b36c5774cc0
parent928d46787dac726a888f47874832da02db858dd4 (diff)
parent8dc6861c3b5f20994985858613da4c199b6233bc (diff)
downloadkernel-292617f45e429e7ad7c2c63f2116e330bf02a5dc.tar.gz
kernel-292617f45e429e7ad7c2c63f2116e330bf02a5dc.tar.xz
kernel-292617f45e429e7ad7c2c63f2116e330bf02a5dc.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc5.git2.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc5.git2.1.vanilla.knurd.1.fc27
-rw-r--r--gitrev2
-rw-r--r--kernel.spec5
-rw-r--r--sources2
3 files changed, 6 insertions, 3 deletions
diff --git a/gitrev b/gitrev
index 6dc5994e7..5d5fa4b74 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-21b9f1c7e319f654de3b2574fe8d4e4114c9143f
+58ddfe6c3af91d320cf5d0aba33143e7c1d8dc35
diff --git a/kernel.spec b/kernel.spec
index 53dd43c38..077495e39 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 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -1876,6 +1876,9 @@ fi
#
#
%changelog
+* Thu May 17 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc5.git2.1
+- Linux v4.17-rc5-65-g58ddfe6c3af9
+
* Tue May 15 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc5.git1.1
- Linux v4.17-rc5-20-g21b9f1c7e319
- Reenable debugging options.
diff --git a/sources b/sources
index 1def2ea44..a0457332e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
SHA512 (patch-4.17-rc5.xz) = 00599599b13efa89ac7d2f33a5b4eb09c4226add9944ae10cc08fa8c98d08a9a7a58e234bbafd4ccfe00cc808979ce98018d9fc1cf8245ad74574233cffb9883
-SHA512 (patch-4.17-rc5-git1.xz) = a93b6004b2cde15478aa527e7f9ac05f9d1913b880a9e020db7b1651fb6dd460668f80aea3e23b04e9889c283559a9bb08c5079bd24dd6b06735d57af06373a4
+SHA512 (patch-4.17-rc5-git2.xz) = b285a8d7c127807724c539413c828fc7da53b16b50e42f35fa4416ed64107b735dea11aa5709e670146e7dab0e042e8682f5b87d47d5f00ad9b2cbf6237fbeca