summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-09-28 19:12:05 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2017-09-28 19:12:05 +0200
commitdb97001cedc77225e8d3e92a0c766d23b2cf252c (patch)
tree6c94f4af830dd1acf06cf9582a7fb4c4daca9db6
parent859d9b8e081f0db013456dd65ba3289019b00435 (diff)
parent29fb356e7c585d99b03334cccbe921b6243d4743 (diff)
downloadkernel-db97001cedc77225e8d3e92a0c766d23b2cf252c.tar.gz
kernel-db97001cedc77225e8d3e92a0c766d23b2cf252c.tar.xz
kernel-db97001cedc77225e8d3e92a0c766d23b2cf252c.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-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 1fb6ea905..563f89466 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-e365806ac289457263a133bd32df8df49897f612
+dc972a67cc54585bd83ad811c4e9b6ab3dcd427e
diff --git a/kernel.spec b/kernel.spec
index 6f648abeb..a5b03c09c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 2
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2216,6 +2216,9 @@ fi
#
#
%changelog
+* Wed Sep 27 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc2.git2.1
+- Linux v4.14-rc2-48-gdc972a67cc54
+
* Tue Sep 26 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc2.git1.1
- Linux v4.14-rc2-44-ge365806ac289
- Reenable debugging options.
diff --git a/sources b/sources
index 26ebd9a64..f8201a737 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03
SHA512 (patch-4.14-rc2.xz) = bfdf4ed88f7eeef35f723d886ea059a2fac69b7ea18313abe768d06674f6c36ca0579dd61170b9c91aeb7cc055af3c8330b15e092e8f4880ef6c8d93bd6cfa48
-SHA512 (patch-4.14-rc2-git1.xz) = 218386592cc5e0bf8622a0b01da57ca5518bba5a380977e79eb911bccfbdc4efbb0db2c47b9bba3e93839be478b8e0f2adba27d54dd0d9d9103b934631902ea6
+SHA512 (patch-4.14-rc2-git2.xz) = 8b512dea4b32aaf617457a9d5bc6ff132fc27d1e21d499a64f646ecde94f26dd8e8579566e85eae49be565fb8bd0127a13743337aee822d642661c2536422cf1