Merge 6.3-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Mar 2023 07:27:01 +0000 (09:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Mar 2023 07:27:01 +0000 (09:27 +0200)
We need the USB fixes here, and the USB gadget update for future
development patches to be based on.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
arch/mips/configs/mtx1_defconfig
arch/powerpc/configs/ppc6xx_defconfig
drivers/usb/chipidea/core.c
drivers/usb/dwc3/core.h
drivers/usb/dwc3/gadget.c
drivers/usb/gadget/composite.c
drivers/usb/typec/tcpm/tcpm.c

Simple merge
Simple merge
Simple merge
@@@ -1099,10 -1098,8 +1099,10 @@@ struct dwc3_scratchpad_array 
   *                    change quirk.
   * @dis_tx_ipgap_linecheck_quirk: set if we disable u2mac linestate
   *                    check during HS transmit.
-  * @resume-hs-terminations: Set if we enable quirk for fixing improper crc
+  * @resume_hs_terminations: Set if we enable quirk for fixing improper crc
   *                    generation after resume from suspend.
 + * @ulpi_ext_vbus_drv: Set to confiure the upli chip to drives CPEN pin
 + *                    VBUS with an external supply.
   * @parkmode_disable_ss_quirk: set if we need to disable all SuperSpeed
   *                    instances in park mode.
   * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk
Simple merge
Simple merge
Simple merge