Merge tag 'usb-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB / Thunderbolt updates from Greg KH:
 "Here is the big set of USB and thunderbolt drivers for 6.18-rc1. It
  was another normal development cycle, with lots of the usual drivers
  getting updates:

   - Thunderbolt driver cleanups and additions

   - dwc3 driver updates

   - dwc2 driver updates

   - typec driver updates

   - xhci driver updates and additions

   - offload USB engine updates for better power management

   - unused tracepoint removals

   - usb gadget fixes and updates as more users start to rely on these
     drivers instead of the "old" function gadget drivers

   - new USB device ids

   - other minor driver USB driver updates

   - new USB I/O driver framework and driver additions"

  The last item, the usb i/o driver, has an i2c and gpio driver added
  through this tree. Those drivers were acked by the respective
  subsystem maintainers.

  All of these have been in linux-next for a while"

* tag 'usb-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (132 commits)
  usb: vhci-hcd: Prevent suspending virtually attached devices
  USB: serial: option: add SIMCom 8230C compositions
  thunderbolt: Fix use-after-free in tb_dp_dprx_work
  usb: xhci: align PORTSC trace with one-based port numbering
  usb: xhci: correct indentation for PORTSC tracing function
  usb: xhci: improve TR Dequeue Pointer mask
  usb: xhci-pci: add support for hosts with zero USB3 ports
  usb: xhci: Update a comment about Stop Endpoint retries
  Revert "usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running"
  usb: gadget: f_rndis: Refactor bind path to use __free()
  usb: gadget: f_ecm: Refactor bind path to use __free()
  usb: gadget: f_acm: Refactor bind path to use __free()
  usb: gadget: f_ncm: Refactor bind path to use __free()
  usb: gadget: Introduce free_usb_request helper
  usb: gadget: Store endpoint pointer in usb_request
  usb: host: xhci-rcar: Add Renesas RZ/G3E USB3 Host driver support
  usb: host: xhci-plat: Add .post_resume_quirk for struct xhci_plat_priv
  usb: host: xhci-rcar: Move R-Car reg definitions
  dt-bindings: usb: Document Renesas RZ/G3E USB3HOST
  usb: gadget: f_fs: Fix epfile null pointer access after ep enable.
  ...

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/i2c/busses/Kconfig
index ae8fcc86406032e37258092640eaa3c095247ea6,06b1b702fd7a7e66e8e0d8d211e57d9f637cb7a0..fd81e49638aaa161ae264a722e9e06adc7914cda
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -1358,16 -1357,17 +1358,27 @@@ config I2C_LJC
          This driver can also be built as a module.  If so, the module
          will be called i2c-ljca.
  
 +config I2C_NCT6694
 +      tristate "Nuvoton NCT6694 I2C adapter support"
 +      depends on MFD_NCT6694
 +      help
 +        If you say yes to this option, support will be included for Nuvoton
 +        NCT6694, a USB to I2C interface.
 +
 +        This driver can also be built as a module. If so, the module will
 +        be called i2c-nct6694.
 +
+ config I2C_USBIO
+       tristate "Intel USBIO I2C Adapter support"
+       depends on USB_USBIO
+       default USB_USBIO
+       help
+         Select this option to enable I2C driver for the INTEL
+         USBIO driver stack.
+ 
+         This driver can also be built as a module.  If so, the module
+         will be called i2c_usbio.
+ 
  config I2C_CP2615
        tristate "Silicon Labs CP2615 USB sound card and I2C adapter"
        depends on USB

diff --cc drivers/i2c/busses/Makefile
index fe8cf6325fc989c5262b4cb259736261ce8de683,401a79c9767e61b5b18447d8cd2fcdacc66d18c6..fb985769f5ff78a8de8aaa93668c7c4a7af590ac
--- 1/drivers/i2c/busses/Makefile
--- 2/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@@ -135,7 -135,7 +135,8 @@@ obj-$(CONFIG_I2C_GXP)              += i2c-gxp.
  obj-$(CONFIG_I2C_DIOLAN_U2C)  += i2c-diolan-u2c.o
  obj-$(CONFIG_I2C_DLN2)                += i2c-dln2.o
  obj-$(CONFIG_I2C_LJCA)                += i2c-ljca.o
 +obj-$(CONFIG_I2C_NCT6694)     += i2c-nct6694.o
+ obj-$(CONFIG_I2C_USBIO)               += i2c-usbio.o
  obj-$(CONFIG_I2C_CP2615) += i2c-cp2615.o
  obj-$(CONFIG_I2C_PARPORT)     += i2c-parport.o
  obj-$(CONFIG_I2C_PCI1XXXX)    += i2c-mchp-pci1xxxx.o

diff --cc drivers/media/usb/uvc/uvc_driver.c
Simple merge

diff --cc drivers/media/usb/uvc/uvc_video.c
Simple merge

diff --cc drivers/media/usb/uvc/uvcvideo.h
Simple merge

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