Merge v6.14-rc6 into usb-next

Resolves the merge conflict with:
	drivers/usb/typec/ucsi/ucsi_acpi.c

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

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/dwc3/gadget.c
Simple merge

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

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

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

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

diff --cc drivers/usb/typec/ucsi/ucsi.h
index feb012db4c89448ef42765d15bbba7c669d31da2,28780acc4af2e7e6b9730e7c0cf37dc72a363170..3a2c1762bec1bfbc556e3a062f57a5469f62400b
--- 1/drivers/usb/typec/ucsi/ucsi.h
--- 2/drivers/usb/typec/ucsi/ucsi.h
+++ b/drivers/usb/typec/ucsi/ucsi.h
@@@ -76,9 -77,9 +77,10 @@@ struct dentry
  struct ucsi_operations {
        int (*read_version)(struct ucsi *ucsi, u16 *version);
        int (*read_cci)(struct ucsi *ucsi, u32 *cci);
+       int (*poll_cci)(struct ucsi *ucsi, u32 *cci);
        int (*read_message_in)(struct ucsi *ucsi, void *val, size_t val_len);
 -      int (*sync_control)(struct ucsi *ucsi, u64 command);
 +      int (*sync_control)(struct ucsi *ucsi, u64 command, u32 *cci,
 +                          void *data, size_t size);
        int (*async_control)(struct ucsi *ucsi, u64 command);
        bool (*update_altmodes)(struct ucsi *ucsi, struct ucsi_altmode *orig,
                                struct ucsi_altmode *updated);

diff --cc drivers/usb/typec/ucsi/ucsi_acpi.c
index ada5d0d21ee6fb1f406b6a8b8466bc71ffdb5b46,ac1ebb5d952720d2cd7620751a684c87a63f8fe1..6b92f296e98509a146e847f9a4000a2f6bbe175b
--- 1/drivers/usb/typec/ucsi/ucsi_acpi.c
--- 2/drivers/usb/typec/ucsi/ucsi_acpi.c
+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
@@@ -131,7 -131,25 +137,8 @@@ static int ucsi_gram_sync_control(struc
  static const struct ucsi_operations ucsi_gram_ops = {
        .read_version = ucsi_acpi_read_version,
        .read_cci = ucsi_acpi_read_cci,
 -      .read_message_in = ucsi_gram_read_message_in,
+       .poll_cci = ucsi_acpi_poll_cci,
 +      .read_message_in = ucsi_acpi_read_message_in,
        .sync_control = ucsi_gram_sync_control,
        .async_control = ucsi_acpi_async_control
  };

diff --cc drivers/usb/typec/ucsi/ucsi_ccg.c
Simple merge