linux-next: manual merge of the usb-gadget tree with the driver-core tree

linux-next: manual merge of the usb-gadget tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 997 bytes --]

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc/pxa27x_udc.c between commit 6d3f5f2d895b ("usb:
gadget: udc: drop owner assignment from platform_drivers") from the
driver-core tree and commit 1803fe15ad54 ("usb: gadget: pxa27x_udc: add
devicetree support") from the usb-gadget 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/gadget/udc/pxa27x_udc.c
index 61bceedf515d,69e7b816d880..000000000000
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@@ -2614,6 -2589,8 +2589,7 @@@ MODULE_ALIAS("platform:pxa27x-udc")
  static struct platform_driver udc_driver = {
  	.driver		= {
  		.name	= "pxa27x-udc",
 -		.owner	= THIS_MODULE,
+ 		.of_match_table = of_match_ptr(udc_pxa_dt_ids),
  	},
  	.probe		= pxa_udc_probe,
  	.remove		= pxa_udc_remove,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the usb-gadget tree with the driver-core tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 ("usb: dwc2: drop
owner assignment from platform_drivers") from the driver-core tree and
commit 117777b2c3bb ("usb: dwc2: Move gadget probe function into
platform code") from the usb-gadget tree.

I fixed it up (the latter removed the code changed 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: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the usb-gadget tree with the driver-core tree

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

Hi,

On Tue, Nov 18, 2014 at 06:12:22PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 ("usb: dwc2: drop
> owner assignment from platform_drivers") from the driver-core tree and

why is that commit in the driver-core tree ? It wasn't even acked by
Paul Z. It wasn't sent to linux-usb either.

Sure, it's minimal, but I'd expect a little cordiality in Ccing driver
maintainers ;-)

Anyway, thanks for fixing it all up Stephen.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the usb-gadget tree with the driver-core tree

[Greg KH]

On Tue, Nov 18, 2014 at 09:25:31AM -0600, Felipe Balbi wrote:
> Hi,
> 
> On Tue, Nov 18, 2014 at 06:12:22PM +1100, Stephen Rothwell wrote:
> > Hi Felipe,
> > 
> > Today's linux-next merge of the usb-gadget tree got a conflict in
> > drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 ("usb: dwc2: drop
> > owner assignment from platform_drivers") from the driver-core tree and
> 
> why is that commit in the driver-core tree ? It wasn't even acked by
> Paul Z. It wasn't sent to linux-usb either.
> 
> Sure, it's minimal, but I'd expect a little cordiality in Ccing driver
> maintainers ;-)

We fixed up many hundreds of drivers all at once, it was easier to take
that change through my driver-core tree than try to coordinate in
everyone's different trees and end up missing some usages.

thanks,

greg k-h

Re: linux-next: manual merge of the usb-gadget tree with the driver-core tree

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1032 bytes --]

On Tue, Nov 18, 2014 at 08:24:36AM -0800, Greg KH wrote:
> On Tue, Nov 18, 2014 at 09:25:31AM -0600, Felipe Balbi wrote:
> > Hi,
> > 
> > On Tue, Nov 18, 2014 at 06:12:22PM +1100, Stephen Rothwell wrote:
> > > Hi Felipe,
> > > 
> > > Today's linux-next merge of the usb-gadget tree got a conflict in
> > > drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 ("usb: dwc2: drop
> > > owner assignment from platform_drivers") from the driver-core tree and
> > 
> > why is that commit in the driver-core tree ? It wasn't even acked by
> > Paul Z. It wasn't sent to linux-usb either.
> > 
> > Sure, it's minimal, but I'd expect a little cordiality in Ccing driver
> > maintainers ;-)
> 
> We fixed up many hundreds of drivers all at once, it was easier to take
> that change through my driver-core tree than try to coordinate in
> everyone's different trees and end up missing some usages.

sure, got that :-) still, no maintainer was Cced :-)

Well, the conflict would've been inevitable anyway.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]