From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Feng Tang <feng.tang@intel.com>, Len Brown <lenb@kernel.org>,
Lan Tianyu <tianyu.lan@intel.com>,
Sarah Sharp <sarah.a.sharp@linux.intel.com>
Subject: Re: linux-next: manual merge of the usb tree with the acpi tree
Date: Mon, 24 Sep 2012 16:54:49 +1000 [thread overview]
Message-ID: <20120924165449.58e81fb0c925ecc580ec502e@canb.auug.org.au> (raw)
In-Reply-To: <20120924164916.faeb0225ef2b0732762d8aac@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1973 bytes --]
Hi Greg,
On Mon, 24 Sep 2012 16:49:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa ("usb-acpi:
> Comply with the ACPI API change") from the acpi tree and commit
> 05f916894a69 ("usb/acpi: Store info on device removability") from the usb
> tree.
>
> The latter removed the function changed by the former, so I just did that
> and can carry the fix as necessary (no action is required).
It also needed this merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Sep 2012 16:51:38 +1000
Subject: [PATCH] usb-acpi: Comply with the ACPI API change after usb tree
merge
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/usb/core/usb-acpi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
index 0ef7d42..e9b159a 100644
--- a/drivers/usb/core/usb-acpi.c
+++ b/drivers/usb/core/usb-acpi.c
@@ -87,7 +87,7 @@ static int usb_acpi_check_port_connect_type(struct usb_device *hdev,
acpi_status status;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object *upc;
- struct acpi_pld pld;
+ struct acpi_pld_info *pld;
int ret = 0;
/*
@@ -111,13 +111,13 @@ static int usb_acpi_check_port_connect_type(struct usb_device *hdev,
}
if (upc->package.elements[0].integer.value)
- if (pld.user_visible)
+ if (pld->user_visible)
usb_set_hub_port_connect_type(hdev, port1,
USB_PORT_CONNECT_TYPE_HOT_PLUG);
else
usb_set_hub_port_connect_type(hdev, port1,
USB_PORT_CONNECT_TYPE_HARD_WIRED);
- else if (!pld.user_visible)
+ else if (!pld->user_visible)
usb_set_hub_port_connect_type(hdev, port1, USB_PORT_NOT_USED);
out:
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-09-24 6:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 6:49 Stephen Rothwell
2012-09-24 6:54 ` Stephen Rothwell [this message]
2012-09-25 22:39 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120924165449.58e81fb0c925ecc580ec502e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=feng.tang@intel.com \
--cc=greg@kroah.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sarah.a.sharp@linux.intel.com \
--cc=tianyu.lan@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®