Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1680632

Re: [GIT PULL] USB/PHY patches for 4.13-rc1

From Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups linux.kernel
Subject Re: [GIT PULL] USB/PHY patches for 4.13-rc1
Date 2017-07-04 03:30 +0200
Message-ID <tZkP7-17V-1@gated-at.bofh.it> (permalink)
References <tZaZr-2UC-9@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Hi all,

On Mon, 3 Jul 2017 16:58:47 +0200 Greg KH <gregkh@linuxfoundation.org> 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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[GIT PULL] USB/PHY patches for 4.13-rc1 Greg KH <gregkh@linuxfoundation.org> - 2017-07-03 17:00 +0200
  Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-04 03:30 +0200
  Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Geert Uytterhoeven <geert@linux-m68k.org> - 2017-07-04 09:20 +0200
    Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Greg KH <gregkh@linuxfoundation.org> - 2017-07-04 10:10 +0200
      Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Geert Uytterhoeven <geert@linux-m68k.org> - 2017-07-04 11:10 +0200
        Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Greg KH <gregkh@linuxfoundation.org> - 2017-07-04 11:20 +0200
          Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Geert Uytterhoeven <geert@linux-m68k.org> - 2017-07-04 12:40 +0200
        Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Babu Moger <babu.moger@oracle.com> - 2017-07-04 19:30 +0200
          Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Max Filippov <jcmvbkbc@gmail.com> - 2017-07-06 10:30 +0200
            Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Greg KH <gregkh@linuxfoundation.org> - 2017-07-06 16:40 +0200
              Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Babu Moger <babu.moger@oracle.com> - 2017-07-06 17:30 +0200
                Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Greg KH <gregkh@linuxfoundation.org> - 2017-07-06 18:00 +0200
                Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Babu Moger <babu.moger@oracle.com> - 2017-07-06 18:00 +0200
            Re: [GIT PULL] USB/PHY patches for 4.13-rc1 Babu Moger <babu.moger@oracle.com> - 2017-07-06 16:40 +0200

csiph-web