Merge v6.12-rc6 into usb-next

We need the USB fixes in here as well, and this resolves a merge
conflict in:
	drivers/usb/typec/tcpm/tcpm.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20241101150730.090dc30f@canb.auug.org.au
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

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

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

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

diff --cc drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
Simple merge

diff --cc drivers/usb/typec/tcpm/tcpm.c
index a8fcca029e784caed01c9ef59c0d00988bfcc07a,7ae341a403424cbc00825ad3c8ac740213ef9193..0334a41c710c07a2d74159e96e0f3fe444f10461
--- 1/drivers/usb/typec/tcpm/tcpm.c
--- 2/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@@ -5055,10 -5042,13 +5056,14 @@@ static void run_state_machine(struct tc
                if (port->vbus_never_low) {
                        port->vbus_never_low = false;
                        tcpm_set_state(port, SNK_SOFT_RESET,
 -                                     PD_T_SINK_WAIT_CAP);
 +                                     port->timings.sink_wait_cap_time);
                } else {
 -                      tcpm_set_state(port, upcoming_state, PD_T_SINK_WAIT_CAP);
+                       if (!port->self_powered)
+                               upcoming_state = SNK_WAIT_CAPABILITIES_TIMEOUT;
+                       else
+                               upcoming_state = hard_reset_state(port);
 +                      tcpm_set_state(port, SNK_WAIT_CAPABILITIES_TIMEOUT,
 +                                     port->timings.sink_wait_cap_time);
                }
                break;
        case SNK_WAIT_CAPABILITIES_TIMEOUT: