Merge 6.2-rc7 into usb-next

We need the USB fixes in here, and this resolves a merge conflict with
the i915 driver as reported in linux-next

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index 2daffa7,21cb5b6..178ff20
--- 1/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
--- 2/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@@ -4148,6 -4148,33 +4148,22 @@@ void intel_execlists_show_requests(stru
        spin_unlock_irqrestore(&sched_engine->lock, flags);
  }
  
 -static unsigned long list_count(struct list_head *list)
 -{
 -      struct list_head *pos;
 -      unsigned long count = 0;
 -
 -      list_for_each(pos, list)
 -              count++;
 -
 -      return count;
 -}
 -
+ void intel_execlists_dump_active_requests(struct intel_engine_cs *engine,
+                                         struct i915_request *hung_rq,
+                                         struct drm_printer *m)
+ {
+       unsigned long flags;
+ 
+       spin_lock_irqsave(&engine->sched_engine->lock, flags);
+ 
+       intel_engine_dump_active_requests(&engine->sched_engine->requests, hung_rq, m);
+ 
+       drm_printf(m, "\tOn hold?: %lu\n",
 -                 list_count(&engine->sched_engine->hold));
++                 list_count_nodes(&engine->sched_engine->hold));
+ 
+       spin_unlock_irqrestore(&engine->sched_engine->lock, flags);
+ }
+ 
  #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
  #include "selftest_execlists.c"
  #endif

diff --cc drivers/usb/fotg210/fotg210-udc.c
index 9034eaf,eb07674..f7ea840
--- 1/drivers/usb/fotg210/fotg210-udc.c
--- 2/drivers/usb/fotg210/fotg210-udc.c
+++ b/drivers/usb/fotg210/fotg210-udc.c
@@@ -1010,12 -1014,7 +1010,11 @@@ static int fotg210_udc_start(struct usb
        int ret;
  
        /* hook up the driver */
-       driver->driver.bus = NULL;
        fotg210->driver = driver;
 +      fotg210->gadget.dev.of_node = fotg210->dev->of_node;
 +      fotg210->gadget.speed = USB_SPEED_UNKNOWN;
 +
 +      dev_info(fotg210->dev, "bound driver %s\n", driver->driver.name);
  
        if (!IS_ERR_OR_NULL(fotg210->phy)) {
                ret = otg_set_peripheral(fotg210->phy->otg,

diff --cc drivers/usb/gadget/function/f_fs.c
Simple merge

diff --cc drivers/usb/gadget/udc/bcm63xx_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/fusb300_udc.c
Simple merge

diff --cc drivers/usb/typec/ucsi/ucsi.c
Simple merge