summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-09-20 05:49:04 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2017-09-20 05:49:04 +0200
commitdfb64634d5b4a6b91493c3f5a0ba665a9104bae0 (patch)
tree6a3056a749690b0feb321901b382fb90ee09f14c /kernel.spec
parentb737f8fbced0744768781c824f00fd24b04493b3 (diff)
parent2a0ad70ea25219cd7c3779ef9f485c5df2ba3a9e (diff)
downloadkernel-dfb64634d5b4a6b91493c3f5a0ba665a9104bae0.tar.gz
kernel-dfb64634d5b4a6b91493c3f5a0ba665a9104bae0.tar.xz
kernel-dfb64634d5b4a6b91493c3f5a0ba665a9104bae0.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc1.git1.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc1.git1.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec15
1 files changed, 13 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index bc0e3bc79..08a412c02 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 1
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -133,7 +133,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
# Want to build a vanilla kernel build without any non-upstream patches?
%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -656,6 +656,9 @@ Patch617: Fix-for-module-sig-verification.patch
Patch618: HID-rmi-Make-sure-the-HID-device-is-opened-on-resume.patch
Patch619: input-rmi4-remove-the-need-for-artifical-IRQ.patch
+# Fixes PPC build
+Patch620: Revert-KVM-Don-t-accept-obviously-wrong-gsi-values-via-KVM_IRQFD.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2213,6 +2216,14 @@ fi
#
#
%changelog
+* Tue Sep 19 2017 Laura Abbott <labbott@redhat.com>
+- Disable CONFIG_VIRTIO_BLK_SCSI
+
+* Tue Sep 19 2017 Justin M. Forbes <jforbes@redhat.com> - 4.14.0-0.rc1.git1.1
+- Linux v4.14-rc1-13-gebb2c2437d80
+- Reenable debugging options.
+- Fix PPC build
+
* Mon Sep 18 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc1.git0.1
- Linux v4.14-rc1