linux-next: manual merge of the usb tree with the usb.current tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/usb/typec/ucsi/ucsi_acpi.c

between commit:

  976e7e9bdc77 ("acpi: typec: ucsi: Introduce a ->poll_cci method")

from the usb.current tree and commit:

  f9cf5401526c ("usb: typec: ucsi: acpi: move LG Gram quirk to ucsi_gram_sync_control()")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/usb/typec/ucsi/ucsi_acpi.c
index ac1ebb5d9527,ada5d0d21ee6..000000000000
--- a/drivers/usb/typec/ucsi/ucsi_acpi.c
+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
@@@ -131,25 -131,7 +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
  };

Attachment: pgpd296AiuyWT.pgp
Description: OpenPGP digital signature