Merge 5.17-rc6 into usb-next

We need the USB fixes in here, and it resolves a merge conflict in:
	drivers/usb/dwc3/dwc3-pci.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/dwc3/dwc3-pci.c
index 4330c974b31baec22daca24ed21c431730f16d9a,06d0e88ec8af96afd857e31c2c1594c6ac4d45e2..2e0219901c5725cbb26390c9352bf04815de1621
--- 1/drivers/usb/dwc3/dwc3-pci.c
--- 2/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@@ -119,10 -120,9 +120,16 @@@ static const struct property_entry dwc3
        {}
  };
  
 +static const struct property_entry dwc3_pci_intel_phy_charger_detect_properties[] = {
 +      PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),
 +      PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),
 +      PROPERTY_ENTRY_BOOL("linux,phy_charger_detect"),
++      {}
++};
++
+ static const struct property_entry dwc3_pci_intel_byt_properties[] = {
+       PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),
+       PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),
        PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
        {}
  };
@@@ -169,10 -169,10 +176,14 @@@ static const struct software_node dwc3_
        .properties = dwc3_pci_intel_properties,
  };
  
 +static const struct software_node dwc3_pci_intel_phy_charger_detect_swnode = {
 +      .properties = dwc3_pci_intel_phy_charger_detect_properties,
 +};
 +
+ static const struct software_node dwc3_pci_intel_byt_swnode = {
+       .properties = dwc3_pci_intel_byt_properties,
+ };
+ 
  static const struct software_node dwc3_pci_intel_mrfld_swnode = {
        .properties = dwc3_pci_mrfld_properties,
  };

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