From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 10 Mar 2025 07:16:31 +0000 (+0100)
Subject: Merge v6.14-rc6 into usb-next
X-Git-Tag: v6.15-rc1~46^2~19
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=525b139fb4033a9ba5abd6ca3f6a6baa3b2fe3d4;p=linux-block.git

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

525b139fb4033a9ba5abd6ca3f6a6baa3b2fe3d4
diff --cc drivers/usb/typec/ucsi/ucsi.h
index feb012db4c89,28780acc4af2..3a2c1762bec1
--- a/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 ada5d0d21ee6,ac1ebb5d9527..6b92f296e985
--- a/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,
+ 	.poll_cci = ucsi_acpi_poll_cci,
 -	.read_message_in = ucsi_gram_read_message_in,
 +	.read_message_in = ucsi_acpi_read_message_in,
  	.sync_control = ucsi_gram_sync_control,
  	.async_control = ucsi_acpi_async_control
  };