Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752040AbdGDB1o (ORCPT ); Mon, 3 Jul 2017 21:27:44 -0400 Received: from ozlabs.org ([103.22.144.67]:53609 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750849AbdGDB1n (ORCPT ); Mon, 3 Jul 2017 21:27:43 -0400 Date: Tue, 4 Jul 2017 11:27:33 +1000 From: Stephen Rothwell To: Greg KH Cc: Linus Torvalds , Andrew Morton , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Message-ID: <20170704112733.7e19d4c4@canb.auug.org.au> In-Reply-To: <20170703145847.GA20815@kroah.com> References: <20170703145847.GA20815@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1313 Lines: 47 Hi all, On Mon, 3 Jul 2017 16:58:47 +0200 Greg KH wrote: > > All of these have been in linux-next for a while with no reported > issues. I have been carrying the following merge fix patch for the merge against the uuid tree (now in Linus' tree): From: Stephen Rothwell Date: Thu, 29 Jun 2017 14:36:10 +1000 Subject: [PATCH] usb: typec: fix for "ACPI: Switch to use generic guid_t in acpi_evaluate_dsm()" Signed-off-by: Stephen Rothwell --- drivers/usb/typec/ucsi/ucsi_acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c index 3fb2e48e1c91..7b7c9373a9b6 100644 --- a/drivers/usb/typec/ucsi/ucsi_acpi.c +++ b/drivers/usb/typec/ucsi/ucsi_acpi.c @@ -23,14 +23,14 @@ struct ucsi_acpi { struct device *dev; struct ucsi *ucsi; struct ucsi_ppm ppm; - uuid_le uuid; + guid_t uuid; }; static int ucsi_acpi_dsm(struct ucsi_acpi *ua, int func) { union acpi_object *obj; - obj = acpi_evaluate_dsm(ACPI_HANDLE(ua->dev), ua->uuid.b, 1, func, + obj = acpi_evaluate_dsm(ACPI_HANDLE(ua->dev), &ua->uuid, 1, func, NULL); if (!obj) { dev_err(ua->dev, "%s: failed to evaluate _DSM %d\n", -- 2.11.0 -- Cheers, Stephen Rothwell