* linux-next: manual merge of the usb tree with the driver-core tree
@ 2013-01-28 10:23 Stephen Rothwell
2013-01-29 13:41 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2013-01-28 10:23 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Thierry Reding, Kishon Vijay Abraham I,
Felipe Balbi
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/musb/omap2430.c between commit 148e11349b0c ("usb: Convert to
devm_ioremap_resource()") from the driver-core tree and commit
ca784be36cc7 ("usb: start using the control module driver") from the usb
tree.
I fixed it up (the latter removed the code modified by the former, so I
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] 8+ messages in thread
* Re: linux-next: manual merge of the usb tree with the driver-core tree
2013-01-28 10:23 linux-next: manual merge of the usb tree with the driver-core tree Stephen Rothwell
@ 2013-01-29 13:41 ` Greg KH
0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2013-01-29 13:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Thierry Reding, Kishon Vijay Abraham I,
Felipe Balbi
On Mon, Jan 28, 2013 at 09:23:09PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/musb/omap2430.c between commit 148e11349b0c ("usb: Convert to
> devm_ioremap_resource()") from the driver-core tree and commit
> ca784be36cc7 ("usb: start using the control module driver") from the usb
> tree.
>
> I fixed it up (the latter removed the code modified by the former, so I
> did that) and can carry the fix as necessary (no action is required).
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the usb tree with the driver-core tree
2014-11-28 6:32 Stephen Rothwell
@ 2014-12-02 18:10 ` Greg KH
0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2014-12-02 18:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Wolfram Sang, linux-next, linux-kernel, Peter Chen
On Fri, Nov 28, 2014 at 05:32:46PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/chipidea/core.c between commit 5bc879a6a271 ("usb:
> chipidea: drop owner assignment from platform_drivers") from the
> driver-core tree and commit 8076932ff2fc ("usb: chipidea: add system
> power management support") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/usb/chipidea/core.c
> index 947ed6e78be2,e14eafb2a05e..000000000000
> --- a/drivers/usb/chipidea/core.c
> +++ b/drivers/usb/chipidea/core.c
> @@@ -751,6 -867,8 +867,7 @@@ static struct platform_driver ci_hdrc_d
> .remove = ci_hdrc_remove,
> .driver = {
> .name = "ci_hdrc",
> + .pm = &ci_pm_ops,
> - .owner = THIS_MODULE,
> },
> };
>
Looks good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the usb tree with the driver-core tree
@ 2014-11-28 6:32 Stephen Rothwell
2014-12-02 18:10 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2014-11-28 6:32 UTC (permalink / raw)
To: Greg KH, Wolfram Sang; +Cc: linux-next, linux-kernel, Peter Chen
[-- Attachment #1: Type: text/plain, Size: 848 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/chipidea/core.c between commit 5bc879a6a271 ("usb:
chipidea: drop owner assignment from platform_drivers") from the
driver-core tree and commit 8076932ff2fc ("usb: chipidea: add system
power management support") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/chipidea/core.c
index 947ed6e78be2,e14eafb2a05e..000000000000
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@@ -751,6 -867,8 +867,7 @@@ static struct platform_driver ci_hdrc_d
.remove = ci_hdrc_remove,
.driver = {
.name = "ci_hdrc",
+ .pm = &ci_pm_ops,
- .owner = THIS_MODULE,
},
};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the usb tree with the driver-core tree
2013-02-18 4:32 Stephen Rothwell
@ 2013-02-18 4:45 ` Greg KH
0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2013-02-18 4:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Thierry Reding, Manjunath Goudar
On Mon, Feb 18, 2013 at 03:32:42PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-vt8500.c between commit 148e11349b0c ("usb: Convert
> to devm_ioremap_resource()") from the driver-core tree and commit
> d57ada0c37ec ("USB: EHCI: make ehci-vt8500 a separate driver") from the
> usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the usb tree with the driver-core tree
@ 2013-02-18 4:32 Stephen Rothwell
2013-02-18 4:45 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2013-02-18 4:32 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Thierry Reding, Manjunath Goudar
[-- Attachment #1: Type: text/plain, Size: 926 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-vt8500.c between commit 148e11349b0c ("usb: Convert
to devm_ioremap_resource()") from the driver-core tree and commit
d57ada0c37ec ("USB: EHCI: make ehci-vt8500 a separate driver") from the
usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/host/ehci-vt8500.c
index 7ecf709,98d65bd..0000000
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@@ -16,7 -16,12 +16,13 @@@
*
*/
+#include <linux/err.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/usb.h>
+ #include <linux/usb/hcd.h>
+ #include <linux/io.h>
+ #include <linux/dma-mapping.h>
#include <linux/of.h>
#include <linux/platform_device.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the usb tree with the driver-core tree
2013-01-28 10:35 Stephen Rothwell
@ 2013-01-28 10:46 ` Felipe Balbi
0 siblings, 0 replies; 8+ messages in thread
From: Felipe Balbi @ 2013-01-28 10:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Thierry Reding,
Kishon Vijay Abraham I, Felipe Balbi
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
On Mon, Jan 28, 2013 at 09:35:35PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/phy/omap-usb2.c between commit 148e11349b0c ("usb: Convert to
> devm_ioremap_resource()") from the tree and commit ca784be36cc7 ("usb:
> start using the control module driver") from the usb tree.
>
> I fixed it up (I wasn't sure how, so I effectively dropped the former
> change) and can carry the fix as necessary (no action is required).
thank you ;-)
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the usb tree with the driver-core tree
@ 2013-01-28 10:35 Stephen Rothwell
2013-01-28 10:46 ` Felipe Balbi
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2013-01-28 10:35 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Thierry Reding, Kishon Vijay Abraham I,
Felipe Balbi
[-- Attachment #1: Type: text/plain, Size: 496 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/phy/omap-usb2.c between commit 148e11349b0c ("usb: Convert to
devm_ioremap_resource()") from the tree and commit ca784be36cc7 ("usb:
start using the control module driver") from the usb tree.
I fixed it up (I wasn't sure how, so I effectively dropped the former
change) 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] 8+ messages in thread
end of thread, other threads:[~2014-12-02 18:10 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-28 10:23 linux-next: manual merge of the usb tree with the driver-core tree Stephen Rothwell
2013-01-29 13:41 ` Greg KH
2013-01-28 10:35 Stephen Rothwell
2013-01-28 10:46 ` Felipe Balbi
2013-02-18 4:32 Stephen Rothwell
2013-02-18 4:45 ` Greg KH
2014-11-28 6:32 Stephen Rothwell
2014-12-02 18:10 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).