Linux v4.14-rc1-35-g820bf5c419e4

4 files changed, 6 insertions, 51 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
deleted file mode 100644
index ebebceb9e..000000000
--- a/Revert-KVM-Don-t-accept-obviously-wrong-gsi-values-via-KVM_IRQFD.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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/gitrev b/gitrev
index 072a80859..e5807a824 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-ebb2c2437d8008d46796902ff390653822af6cc4
+820bf5c419e4b85298e5c3001bd1b5be46d60765
diff --git a/kernel.spec b/kernel.spec
index e8b5607b3..93680bfe3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 1
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -639,9 +639,6 @@ 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
@@ -2196,6 +2193,9 @@ fi
 #
 #
 %changelog
+* Wed Sep 20 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc1.git2.1
+- Linux v4.14-rc1-35-g820bf5c419e4
+
 * Tue Sep 19 2017 Laura Abbott <labbott@redhat.com>
 - Disable CONFIG_VIRTIO_BLK_SCSI
 
diff --git a/sources b/sources
index d58019179..f9c0785b2 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@ SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa7
 SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03
 SHA512 (patch-4.14-rc1.xz) = b74b27279197aa81bd5d906a7da83ecfecf23231b7889bd280b071920bb0094b4aef37ff86a9bbe47c13bd23ee80db81acfb2e49ce25d77b8b3ae3c8c203ae22
 SHA512 (patch-4.14-rc1-git1.xz) = 3f86aec9295d17e1a3547421e456040e2adc72fce2c9871810398873073fecc62346c15a47667f3ad4019ffcadc97708b70cb89bd3acb8b62fe65ef024e453ee
+SHA512 (patch-4.14-rc1-git2.xz) = 363727d3e92ce516f137d8e9af49080c1f87335b4b72dd1a59417ebc618eaabfa21f248da0bfe1c7a74c1f041b68dc603f829c3c958a0fcf90814cf2d6005f09