Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

To resolve conflicts in:
 drivers/infiniband/hw/mlx5/main.c
 drivers/infiniband/hw/mlx5/qp.c

From patches merged into the -rc cycle. The conflict resolution matches
what linux-next has been carrying.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 705c573d0257..a3fad4ec9870 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1442,14 +1442,18 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb
         int number_of_packets = 0;
         unsigned int stream_id = 0;
         void *buf;
-
-        if (uurb->flags & ~(USBDEVFS_URB_ISO_ASAP |
-                                USBDEVFS_URB_SHORT_NOT_OK |
+        unsigned long mask =    USBDEVFS_URB_SHORT_NOT_OK |
                                 USBDEVFS_URB_BULK_CONTINUATION |
                                 USBDEVFS_URB_NO_FSBR |
                                 USBDEVFS_URB_ZERO_PACKET |
-                                USBDEVFS_URB_NO_INTERRUPT))
-                return -EINVAL;
+                                USBDEVFS_URB_NO_INTERRUPT;
+        /* USBDEVFS_URB_ISO_ASAP is a special case */
+        if (uurb->type == USBDEVFS_URB_TYPE_ISO)
+                mask |= USBDEVFS_URB_ISO_ASAP;
+
+        if (uurb->flags & ~mask)
+                        return -EINVAL;
+
         if ((unsigned int)uurb->buffer_length >= USBFS_XFER_MAX)
                 return -EINVAL;
         if (uurb->buffer_length > 0 && !uurb->buffer)