Re: linux-next: manual merge of the usb tree with the uuid tree

On Thu, 2017-06-29 at 14:48 +1000, Stephen Rothwell wrote: > I got the following error: > > drivers/usb/typec/ucsi/ucsi_acpi.c: In function 'ucsi_acpi_dsm': > drivers/usb/typec/ucsi/ucsi_acpi.c:33:48: error: passing argument 2 of > 'acpi_evaluate_dsm' from incompatible pointer type [- > Werror=in

linux-next: manual merge of the usb tree with the uuid tree

Hi Greg, Today's linux-next merge of the usb tree got a conflict in: drivers/usb/misc/ucsi.c between commit: 94116f8126de ("ACPI: Switch to use generic guid_t in acpi_evaluate_dsm()") from the uuid tree and commit: 8243edf44152 ("usb: typec: ucsi: Add ACPI driver") from the usb tree.