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

25 files changed, 82 insertions, 24 deletions

diff --git a/Revert-KVM-Don-t-accept-obviously-wrong-gsi-values-via-KVM_IRQFD.patch b/Revert-KVM-Don-t-accept-obviously-wrong-gsi-values-via-KVM_IRQFD.patch
new file mode 100644
index 000000000..ebebceb9e
--- /dev/null
+++ b/Revert-KVM-Don-t-accept-obviously-wrong-gsi-values-via-KVM_IRQFD.patch
@@ -0,0 +1,46 @@
+From patchwork Sat Sep 16 20:12:24 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: Revert "KVM: Don't accept obviously wrong gsi values via KVM_IRQFD"
+From: =?utf-8?q?Jan_H=2E_Sch=C3=B6nherr?= <jschoenh@amazon.de>
+X-Patchwork-Id: 9954473
+Message-Id: <1505592744-31498-1-git-send-email-jschoenh@amazon.de>
+To: Paolo Bonzini <pbonzini@redhat.com>,
+ =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= <rkrcmar@redhat.com>
+Cc: =?UTF-8?q?Jan=20H=2E=20Sch=C3=B6nherr?= <jschoenh@amazon.de>,
+ linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
+ sachinp@linux.vnet.ibm.com,
+ Abdul Haleem <abdhalee@linux.vnet.ibm.com>, kvm@vger.kernel.org
+Date: Sat, 16 Sep 2017 22:12:24 +0200
+
+This reverts commit 36ae3c0a36b7456432fedce38ae2f7bd3e01a563.
+
+The commit broke compilation on !CONFIG_HAVE_KVM_IRQ_ROUTING. Also,
+there may be cases with CONFIG_HAVE_KVM_IRQ_ROUTING, where larger
+gsi values make sense.
+
+As the commit was meant as an early indicator to user space that
+something is wrong, reverting just restores the previous behavior
+where overly large values are ignored when encountered (without
+any direct feedback).
+
+Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
+Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
+---
+ virt/kvm/eventfd.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
+index c608ab4..f2ac53a 100644
+--- a/virt/kvm/eventfd.c
++++ b/virt/kvm/eventfd.c
+@@ -565,8 +565,6 @@ kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args)
+ {
+ 	if (args->flags & ~(KVM_IRQFD_FLAG_DEASSIGN | KVM_IRQFD_FLAG_RESAMPLE))
+ 		return -EINVAL;
+-	if (args->gsi >= KVM_MAX_IRQ_ROUTES)
+-		return -EINVAL;
+ 
+ 	if (args->flags & KVM_IRQFD_FLAG_DEASSIGN)
+ 		return kvm_irqfd_deassign(kvm, args);
diff --git a/baseconfig/CONFIG_VIRTIO_BLK_SCSI b/baseconfig/CONFIG_VIRTIO_BLK_SCSI
index dcc60f529..e551a8ba1 100644
--- a/baseconfig/CONFIG_VIRTIO_BLK_SCSI
+++ b/baseconfig/CONFIG_VIRTIO_BLK_SCSI
@@ -1 +1 @@
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
diff --git a/gitrev b/gitrev
index 03d2ecc8e..072a80859 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-46c1e79fee417f151547aa46fae04ab06cb666f4
+ebb2c2437d8008d46796902ff390653822af6cc4
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 8e71f5184..2dee2256b 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6364,7 +6364,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 0caaf8d28..05c85d05c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6341,7 +6341,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 78ac44492..309d67aa8 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6925,7 +6925,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 1bcd4a572..f0d4356d0 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6474,7 +6474,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 6d48fd7bd..02074d46f 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6451,7 +6451,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index fb5cf3254..04230bd71 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6902,7 +6902,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 13c5db0c4..1a7a0db00 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -5961,7 +5961,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 25f47f624..85b1679b0 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -5983,7 +5983,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 291cee7a0..c2fc1f7e2 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5983,7 +5983,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 42991c6b5..579e0696f 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5961,7 +5961,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 3d82e62f5..1da154ee7 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -5759,7 +5759,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index f3434f5dc..cacb21165 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -5735,7 +5735,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 6ffe76755..2294fec5b 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5687,7 +5687,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 5cfc41a10..ebd643140 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5663,7 +5663,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 5871cc209..fb2df73e7 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -5686,7 +5686,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index df57b6443..1cca4702c 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -5662,7 +5662,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 74e917abe..812d974f8 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5581,7 +5581,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 3e532ae5b..89db07c06 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5557,7 +5557,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 0d60def84..34fe8e0b6 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -6035,7 +6035,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 6126b1c2a..ffc9196ed 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -6013,7 +6013,7 @@ CONFIG_VIDEO_ZORAN_ZR36060=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
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
 
diff --git a/sources b/sources
index 43ff880dc..d58019179 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
 SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03
 SHA512 (patch-4.14-rc1.xz) = b74b27279197aa81bd5d906a7da83ecfecf23231b7889bd280b071920bb0094b4aef37ff86a9bbe47c13bd23ee80db81acfb2e49ce25d77b8b3ae3c8c203ae22
+SHA512 (patch-4.14-rc1-git1.xz) = 3f86aec9295d17e1a3547421e456040e2adc72fce2c9871810398873073fecc62346c15a47667f3ad4019ffcadc97708b70cb89bd3acb8b62fe65ef024e453ee