* linux-next: manual merge of the usb tree with the acpi tree
@ 2012-09-24 6:49 Stephen Rothwell
2012-09-24 6:54 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-09-24 6:49 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Feng Tang, Len Brown, Lan Tianyu,
Sarah Sharp
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
Hi Greg,
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).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the usb tree with the acpi tree
2012-09-24 6:49 linux-next: manual merge of the usb tree with the acpi tree Stephen Rothwell
@ 2012-09-24 6:54 ` Stephen Rothwell
2012-09-25 22:39 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-09-24 6:54 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Feng Tang, Len Brown, Lan Tianyu,
Sarah Sharp
[-- 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 --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the usb tree with the acpi tree
2012-09-24 6:54 ` Stephen Rothwell
@ 2012-09-25 22:39 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2012-09-25 22:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Feng Tang, Len Brown, Lan Tianyu,
Sarah Sharp
On Mon, Sep 24, 2012 at 04:54:49PM +1000, Stephen Rothwell wrote:
> 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(-)
Ick, thanks for this, hopefully Len handles this properly during the
merge window :)
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-25 22:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-24 6:49 linux-next: manual merge of the usb tree with the acpi tree Stephen Rothwell
2012-09-24 6:54 ` Stephen Rothwell
2012-09-25 22:39 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox