Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 02e98f3131bd..48bd520fc702 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2941,7 +2941,7 @@ static long kvm_vm_ioctl(struct file *filp,
                 if (copy_from_user(&routing, argp, sizeof(routing)))
                         goto out;
                 r = -EINVAL;
-                if (routing.nr >= KVM_MAX_IRQ_ROUTES)
+                if (routing.nr > KVM_MAX_IRQ_ROUTES)
                         goto out;
                 if (routing.flags)
                         goto out;