Merge 5.6-rc7 into usb-next

We need the USB fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/chipidea/udc.c
index ffa6caee1f3bf989da46104a3604fbff27b9fae6,4c4ac30db4987b2d18a5619638d8f7e6c3c7f6ea..921bcf14dc06154ad67649292889565605390a73
--- 1/drivers/usb/chipidea/udc.c
--- 2/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@@ -1530,12 -1530,11 +1530,11 @@@ static const struct usb_ep_ops usb_ep_o
  static void ci_hdrc_gadget_connect(struct usb_gadget *_gadget, int is_active)
  {
        struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget);
-       unsigned long flags;
  
        if (is_active) {
 -              pm_runtime_get_sync(&_gadget->dev);
 +              pm_runtime_get_sync(ci->dev);
                hw_device_reset(ci);
-               spin_lock_irqsave(&ci->lock, flags);
+               spin_lock_irq(&ci->lock);
                if (ci->driver) {
                        hw_device_state(ci, ci->ep0out->qh.dma);
                        usb_gadget_set_state(_gadget, USB_STATE_POWERED);

diff --cc drivers/usb/host/xhci-pci.c
Simple merge