summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-06-21 09:41:16 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2018-06-21 09:41:16 +0200
commita5265e689a38b10fed89a9e577e04a841b47ee27 (patch)
tree1f15d33746abe4ba7f5fc45d6cb8da42d2409836
parent882ba73d42d4b1e8b4f8b7d2965d596f59052ca4 (diff)
parentc6aba0b3363c03b87456664d5c7ba839f36772a5 (diff)
downloadkernel-a5265e689a38b10fed89a9e577e04a841b47ee27.tar.gz
kernel-a5265e689a38b10fed89a9e577e04a841b47ee27.tar.xz
kernel-a5265e689a38b10fed89a9e577e04a841b47ee27.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-0.rc1.git2.1.vanilla.knurd.1.fc29
-rw-r--r--gitrev2
-rw-r--r--kernel.spec13
-rw-r--r--sources1
3 files changed, 13 insertions, 3 deletions
diff --git a/gitrev b/gitrev
index a8fc1782a..abc2f40cf 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-4c5e8fc62d6a63065eeae80808c498d1dcfea4f4
+81e97f01371f4e1701feeafe484665112cd9ddc2
diff --git a/kernel.spec b/kernel.spec
index 5ea9a3ba8..70535523f 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 0
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -130,7 +130,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
%if %{with_verbose}
%define make_opts V=1
@@ -1860,6 +1860,15 @@ fi
#
#
%changelog
+* Wed Jun 20 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git2.1
+- Linux v4.18-rc1-52-g81e97f01371f
+
+* Tue Jun 19 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git1.1
+- Linux v4.18-rc1-43-gba4dbdedd3ed
+
+* Tue Jun 19 2018 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
* Mon Jun 18 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git0.1
- Linux v4.18-rc1
diff --git a/sources b/sources
index 96cfa17da..0f62a19eb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
SHA512 (patch-4.18-rc1.xz) = ead128244b67261c538b6e183eae2c8a33de3a335f6d3fee677e3c30c2345df13732140335060038537320c39716dca0ce2a7e379b30db827c8d7ea6c2fff6e3
+SHA512 (patch-4.18-rc1-git2.xz) = 7926293c598ecdbf11b0a05427fdda9d68d2b4d85d4d169327819cd88cdc9bbce8eb4efcb44959bca9ddbb50a7de48676010b0125ecb66793632f12790b0d6ce