From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 27 Mar 2023 07:27:01 +0000 (+0200)
Subject: Merge 6.3-rc4 into usb-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=97318d6427f62b723c89f4150f8f48126ef74961;p=linux.git

Merge 6.3-rc4 into usb-next

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>
---

97318d6427f62b723c89f4150f8f48126ef74961
diff --cc drivers/usb/dwc3/core.h
index b1bd63188f520,4743e918dcafa..912208585da29
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@@ -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