Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 0 deletions

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index b5fd6e85657c..d1ccc168c071 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -1961,6 +1961,16 @@ int s390int_to_s390irq(struct kvm_s390_interrupt *s390int,
         case KVM_S390_MCHK:
                 irq->u.mchk.mcic = s390int->parm64;
                 break;
+        case KVM_S390_INT_PFAULT_INIT:
+                irq->u.ext.ext_params = s390int->parm;
+                irq->u.ext.ext_params2 = s390int->parm64;
+                break;
+        case KVM_S390_RESTART:
+        case KVM_S390_INT_CLOCK_COMP:
+        case KVM_S390_INT_CPU_TIMER:
+                break;
+        default:
+                return -EINVAL;
         }
         return 0;
 }