Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2020-06-26  3:29 Stephen Rothwell
  2020-06-26 15:14 ` Greg KH
  2020-06-29  6:23 ` Greg KH
  0 siblings, 2 replies; 47+ messages in thread
From: Stephen Rothwell @ 2020-06-26  3:29 UTC (permalink / raw)
  To: Greg KH; +Cc: Linux Next Mailing List, Linux Kernel Mailing List, Peter Chen


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

Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/usb/cdns3/ep0.c

between commit:

  c0e2a0341cd8 ("usb: cdns3: ep0: fix the test mode set incorrectly")

from the usb.current tree and commit:

  62fb45d317c5 ("USB: ch9: add "USB_" prefix in front of TEST defines")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/usb/cdns3/ep0.c
index 61ec5bb2b0ca,04a522f5ae58..000000000000
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@@ -327,12 -327,11 +327,12 @@@ static int cdns3_ep0_feature_handle_dev
  		if (!set || (tmode & 0xff) != 0)
  			return -EINVAL;
  
 -		switch (tmode >> 8) {
 +		tmode >>= 8;
 +		switch (tmode) {
- 		case TEST_J:
- 		case TEST_K:
- 		case TEST_SE0_NAK:
- 		case TEST_PACKET:
+ 		case USB_TEST_J:
+ 		case USB_TEST_K:
+ 		case USB_TEST_SE0_NAK:
+ 		case USB_TEST_PACKET:
  			cdns3_set_register_bit(&priv_dev->regs->usb_cmd,
  					       USB_CMD_STMODE |
  					       USB_STS_TMODE_SEL(tmode - 1));

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2020-06-26  3:29 linux-next: manual merge of the usb tree with the usb.current tree Stephen Rothwell
@ 2020-06-26 15:14 ` Greg KH
  2020-06-29  6:23 ` Greg KH
  1 sibling, 0 replies; 47+ messages in thread
From: Greg KH @ 2020-06-26 15:14 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Peter Chen

On Fri, Jun 26, 2020 at 01:29:10PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/cdns3/ep0.c
> 
> between commit:
> 
>   c0e2a0341cd8 ("usb: cdns3: ep0: fix the test mode set incorrectly")
> 
> from the usb.current tree and commit:
> 
>   62fb45d317c5 ("USB: ch9: add "USB_" prefix in front of TEST defines")
> 
> from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/usb/cdns3/ep0.c
> index 61ec5bb2b0ca,04a522f5ae58..000000000000
> --- a/drivers/usb/cdns3/ep0.c
> +++ b/drivers/usb/cdns3/ep0.c
> @@@ -327,12 -327,11 +327,12 @@@ static int cdns3_ep0_feature_handle_dev
>   		if (!set || (tmode & 0xff) != 0)
>   			return -EINVAL;
>   
>  -		switch (tmode >> 8) {
>  +		tmode >>= 8;
>  +		switch (tmode) {
> - 		case TEST_J:
> - 		case TEST_K:
> - 		case TEST_SE0_NAK:
> - 		case TEST_PACKET:
> + 		case USB_TEST_J:
> + 		case USB_TEST_K:
> + 		case USB_TEST_SE0_NAK:
> + 		case USB_TEST_PACKET:
>   			cdns3_set_register_bit(&priv_dev->regs->usb_cmd,
>   					       USB_CMD_STMODE |
>   					       USB_STS_TMODE_SEL(tmode - 1));



Thanks for this, I'll handle it when I merge the branches together
sometime next week...

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2020-06-26  3:29 linux-next: manual merge of the usb tree with the usb.current tree Stephen Rothwell
  2020-06-26 15:14 ` Greg KH
@ 2020-06-29  6:23 ` Greg KH
  1 sibling, 0 replies; 47+ messages in thread
From: Greg KH @ 2020-06-29  6:23 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Peter Chen

On Fri, Jun 26, 2020 at 01:29:10PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/cdns3/ep0.c
> 
> between commit:
> 
>   c0e2a0341cd8 ("usb: cdns3: ep0: fix the test mode set incorrectly")
> 
> from the usb.current tree and commit:
> 
>   62fb45d317c5 ("USB: ch9: add "USB_" prefix in front of TEST defines")
> 
> from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/usb/cdns3/ep0.c
> index 61ec5bb2b0ca,04a522f5ae58..000000000000
> --- a/drivers/usb/cdns3/ep0.c
> +++ b/drivers/usb/cdns3/ep0.c
> @@@ -327,12 -327,11 +327,12 @@@ static int cdns3_ep0_feature_handle_dev
>   		if (!set || (tmode & 0xff) != 0)
>   			return -EINVAL;
>   
>  -		switch (tmode >> 8) {
>  +		tmode >>= 8;
>  +		switch (tmode) {
> - 		case TEST_J:
> - 		case TEST_K:
> - 		case TEST_SE0_NAK:
> - 		case TEST_PACKET:
> + 		case USB_TEST_J:
> + 		case USB_TEST_K:
> + 		case USB_TEST_SE0_NAK:
> + 		case USB_TEST_PACKET:
>   			cdns3_set_register_bit(&priv_dev->regs->usb_cmd,
>   					       USB_CMD_STMODE |
>   					       USB_STS_TMODE_SEL(tmode - 1));

This is now resolved in my tree, thanks!

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2018-07-01  8:43 ` Greg KH
@ 2018-07-01 15:11   ` Randy Dunlap
  0 siblings, 0 replies; 47+ messages in thread
From: Randy Dunlap @ 2018-07-01 15:11 UTC (permalink / raw)
  To: Greg KH, Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Li Jun

On 07/01/18 01:43, Greg KH wrote:
> On Fri, Jun 29, 2018 at 02:57:19PM +1000, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the usb tree got a conflict in:
>>
>>   drivers/staging/typec/Kconfig
>>
>> between commit:
>>
>>   e16711c32bca ("staging/typec: fix tcpci_rt1711h build errors")
>>
>> from the usb.current tree and commit:
>>
>>   990da41530b3 ("staging: typec: tcpci: move tcpci drivers out of staging")
>>
>> from the usb tree.
>>
>> I fixed it up (I removed the file and allpied the patch below) and can
>> carry the fix as necessary. This is now fixed as far as linux-next is
>> concerned, but any non trivial conflicts should be mentioned to your
>> upstream maintainer when your tree is submitted for merging.  You may
>> also want to consider cooperating with the maintainer of the conflicting
>> tree to minimise any particularly complex conflicts.
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Fri, 29 Jun 2018 14:54:04 +1000
>> Subject: [PATCH] usb: update for tcpci drivers moving out of staging
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>  drivers/usb/typec/Kconfig | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
>> index 972fd1911045..ee808903983f 100644
>> --- a/drivers/usb/typec/Kconfig
>> +++ b/drivers/usb/typec/Kconfig
>> @@ -65,6 +65,7 @@ config TYPEC_TCPCI
>>  
>>  config TYPEC_RT1711H
>>  	tristate "Richtek RT1711H Type-C chip driver"
>> +	depends on I2C
> 
> Thanks for this, I'll apply this to my tree when I merge these together
> in a few days.

I suppose that I could ack it since it's the same as my patch except
for the line numbers...

-- 
~Randy

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2018-06-29  4:57 Stephen Rothwell
@ 2018-07-01  8:43 ` Greg KH
  2018-07-01 15:11   ` Randy Dunlap
  0 siblings, 1 reply; 47+ messages in thread
From: Greg KH @ 2018-07-01  8:43 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Randy Dunlap, Li Jun

On Fri, Jun 29, 2018 at 02:57:19PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/staging/typec/Kconfig
> 
> between commit:
> 
>   e16711c32bca ("staging/typec: fix tcpci_rt1711h build errors")
> 
> from the usb.current tree and commit:
> 
>   990da41530b3 ("staging: typec: tcpci: move tcpci drivers out of staging")
> 
> from the usb tree.
> 
> I fixed it up (I removed the file and allpied the patch below) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Jun 2018 14:54:04 +1000
> Subject: [PATCH] usb: update for tcpci drivers moving out of staging
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/usb/typec/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
> index 972fd1911045..ee808903983f 100644
> --- a/drivers/usb/typec/Kconfig
> +++ b/drivers/usb/typec/Kconfig
> @@ -65,6 +65,7 @@ config TYPEC_TCPCI
>  
>  config TYPEC_RT1711H
>  	tristate "Richtek RT1711H Type-C chip driver"
> +	depends on I2C

Thanks for this, I'll apply this to my tree when I merge these together
in a few days.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2018-06-29  4:57 Stephen Rothwell
  2018-07-01  8:43 ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Stephen Rothwell @ 2018-06-29  4:57 UTC (permalink / raw)
  To: Greg KH
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Randy Dunlap, Li Jun


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/staging/typec/Kconfig

between commit:

  e16711c32bca ("staging/typec: fix tcpci_rt1711h build errors")

from the usb.current tree and commit:

  990da41530b3 ("staging: typec: tcpci: move tcpci drivers out of staging")

from the usb tree.

I fixed it up (I removed the file and allpied the patch below) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jun 2018 14:54:04 +1000
Subject: [PATCH] usb: update for tcpci drivers moving out of staging

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/usb/typec/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
index 972fd1911045..ee808903983f 100644
--- a/drivers/usb/typec/Kconfig
+++ b/drivers/usb/typec/Kconfig
@@ -65,6 +65,7 @@ config TYPEC_TCPCI
 
 config TYPEC_RT1711H
 	tristate "Richtek RT1711H Type-C chip driver"
+	depends on I2C
 	select TYPEC_TCPCI
 	help
 	  Richtek RT1711H Type-C chip driver that works with
-- 
2.17.1


-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2018-04-30 11:55   ` Sebastian Reichel
@ 2018-04-30 12:16     ` Greg KH
  0 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2018-04-30 12:16 UTC (permalink / raw)
  To: Sebastian Reichel
  Cc: Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, Martin Blumenstingl, Johan Hovold

On Mon, Apr 30, 2018 at 01:55:05PM +0200, Sebastian Reichel wrote:
> Hi,
> 
> On Mon, Apr 30, 2018 at 11:34:10AM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > On Mon, 23 Apr 2018 13:04:44 +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/hcd.c
> > > 
> > > between commit:
> > > 
> > >   63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}")
> > > 
> > > from the usb.current tree and commit:
> > > 
> > >   bc40f5341741 ("USB: core: hcd: drop support for legacy phys")
> > > 
> > > from the usb tree.
> > > 
> > > I fixed it up (see below - though I am not sure what happens to the
> > > phy_roothub allocation when usb_phy_roothub_init fails) and can carry
> > > the fix as necessary. This is now fixed as far as linux-next is
> > > concerned, but any non trivial conflicts should be mentioned to your
> > > upstream maintainer when your tree is submitted for merging.  You may
> > > also want to consider cooperating with the maintainer of the
> > > conflicting tree to minimise any particularly complex conflicts.
> > > 
> > > -- 
> > > Cheers,
> > > Stephen Rothwell
> > > 
> > > diff --cc drivers/usb/core/hcd.c
> > > index 0a42c5df3c0f,ac5bcf449d7d..000000000000
> > > --- a/drivers/usb/core/hcd.c
> > > +++ b/drivers/usb/core/hcd.c
> > > @@@ -2742,35 -2740,11 +2743,15 @@@ int usb_add_hcd(struct usb_hcd *hcd
> > >   	int retval;
> > >   	struct usb_device *rhdev;
> > >   
> > > - 	if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->skip_phy_initialization) {
> > > - 		struct usb_phy *phy = usb_get_phy_dev(hcd->self.sysdev, 0);
> > > - 
> > > - 		if (IS_ERR(phy)) {
> > > - 			retval = PTR_ERR(phy);
> > > - 			if (retval == -EPROBE_DEFER)
> > > - 				return retval;
> > > - 		} else {
> > > - 			retval = usb_phy_init(phy);
> > > - 			if (retval) {
> > > - 				usb_put_phy(phy);
> > > - 				return retval;
> > > - 			}
> > > - 			hcd->usb_phy = phy;
> > > - 			hcd->remove_phy = 1;
> > > - 		}
> > > - 	}
> > > - 
> > >   	if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) {
> > >  -		hcd->phy_roothub = usb_phy_roothub_init(hcd->self.sysdev);
> > >  +		hcd->phy_roothub = usb_phy_roothub_alloc(hcd->self.sysdev);
> > > - 		if (IS_ERR(hcd->phy_roothub)) {
> > > - 			retval = PTR_ERR(hcd->phy_roothub);
> > > - 			goto err_phy_roothub_alloc;
> > > - 		}
> > > + 		if (IS_ERR(hcd->phy_roothub))
> > > + 			return PTR_ERR(hcd->phy_roothub);
> > >   
> > >  +		retval = usb_phy_roothub_init(hcd->phy_roothub);
> > >  +		if (retval)
> > > - 			goto err_phy_roothub_alloc;
> > > ++			return retval;
> > >  +
> > >   		retval = usb_phy_roothub_power_on(hcd->phy_roothub);
> > >   		if (retval)
> > >   			goto err_usb_phy_roothub_power_on;
> > 
> > This is now a conflict between the battery tree (since it merged the
> > usb tree) and Linus' tree (since it merged the usb.current tree).
> 
> Thanks for the heads up! I guess using a topic branch for the tcpm
> changes would have been the better choice :( As far as I can see
> there is not much I can do except for mentioning it to Linus when
> I send my pull request.

Sorry about that, you are right, it would have been better to do that :(

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2018-04-30  1:34 ` Stephen Rothwell
  2018-04-30 11:55   ` Sebastian Reichel
@ 2018-04-30 12:00   ` Greg KH
  1 sibling, 0 replies; 47+ messages in thread
From: Greg KH @ 2018-04-30 12:00 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Sebastian Reichel, Linux-Next Mailing List,
	Linux Kernel Mailing List, Martin Blumenstingl, Johan Hovold

On Mon, Apr 30, 2018 at 11:34:10AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 23 Apr 2018 13:04:44 +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/hcd.c
> > 
> > between commit:
> > 
> >   63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}")
> > 
> > from the usb.current tree and commit:
> > 
> >   bc40f5341741 ("USB: core: hcd: drop support for legacy phys")
> > 
> > from the usb tree.
> > 
> > I fixed it up (see below - though I am not sure what happens to the
> > phy_roothub allocation when usb_phy_roothub_init fails) and can carry
> > the fix as necessary. This is now fixed as far as linux-next is
> > concerned, but any non trivial conflicts should be mentioned to your
> > upstream maintainer when your tree is submitted for merging.  You may
> > also want to consider cooperating with the maintainer of the
> > conflicting tree to minimise any particularly complex conflicts.
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell
> > 
> > diff --cc drivers/usb/core/hcd.c
> > index 0a42c5df3c0f,ac5bcf449d7d..000000000000
> > --- a/drivers/usb/core/hcd.c
> > +++ b/drivers/usb/core/hcd.c
> > @@@ -2742,35 -2740,11 +2743,15 @@@ int usb_add_hcd(struct usb_hcd *hcd
> >   	int retval;
> >   	struct usb_device *rhdev;
> >   
> > - 	if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->skip_phy_initialization) {
> > - 		struct usb_phy *phy = usb_get_phy_dev(hcd->self.sysdev, 0);
> > - 
> > - 		if (IS_ERR(phy)) {
> > - 			retval = PTR_ERR(phy);
> > - 			if (retval == -EPROBE_DEFER)
> > - 				return retval;
> > - 		} else {
> > - 			retval = usb_phy_init(phy);
> > - 			if (retval) {
> > - 				usb_put_phy(phy);
> > - 				return retval;
> > - 			}
> > - 			hcd->usb_phy = phy;
> > - 			hcd->remove_phy = 1;
> > - 		}
> > - 	}
> > - 
> >   	if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) {
> >  -		hcd->phy_roothub = usb_phy_roothub_init(hcd->self.sysdev);
> >  +		hcd->phy_roothub = usb_phy_roothub_alloc(hcd->self.sysdev);
> > - 		if (IS_ERR(hcd->phy_roothub)) {
> > - 			retval = PTR_ERR(hcd->phy_roothub);
> > - 			goto err_phy_roothub_alloc;
> > - 		}
> > + 		if (IS_ERR(hcd->phy_roothub))
> > + 			return PTR_ERR(hcd->phy_roothub);
> >   
> >  +		retval = usb_phy_roothub_init(hcd->phy_roothub);
> >  +		if (retval)
> > - 			goto err_phy_roothub_alloc;
> > ++			return retval;
> >  +
> >   		retval = usb_phy_roothub_power_on(hcd->phy_roothub);
> >   		if (retval)
> >   			goto err_usb_phy_roothub_power_on;
> 
> This is now a conflict between the battery tree (since it merged the
> usb tree) and Linus' tree (since it merged the usb.current tree).

I have resolved the merge conflict in my tree.  If the battery tree
wants to pull again from my tree to resolve this for them, they are
welcome to :)

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2018-04-30  1:34 ` Stephen Rothwell
@ 2018-04-30 11:55   ` Sebastian Reichel
  2018-04-30 12:16     ` Greg KH
  2018-04-30 12:00   ` Greg KH
  1 sibling, 1 reply; 47+ messages in thread
From: Sebastian Reichel @ 2018-04-30 11:55 UTC (permalink / raw)
  To: Stephen Rothwell, Greg KH
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Martin Blumenstingl, Johan Hovold


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

Hi,

On Mon, Apr 30, 2018 at 11:34:10AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 23 Apr 2018 13:04:44 +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/hcd.c
> > 
> > between commit:
> > 
> >   63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}")
> > 
> > from the usb.current tree and commit:
> > 
> >   bc40f5341741 ("USB: core: hcd: drop support for legacy phys")
> > 
> > from the usb tree.
> > 
> > I fixed it up (see below - though I am not sure what happens to the
> > phy_roothub allocation when usb_phy_roothub_init fails) and can carry
> > the fix as necessary. This is now fixed as far as linux-next is
> > concerned, but any non trivial conflicts should be mentioned to your
> > upstream maintainer when your tree is submitted for merging.  You may
> > also want to consider cooperating with the maintainer of the
> > conflicting tree to minimise any particularly complex conflicts.
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell
> > 
> > diff --cc drivers/usb/core/hcd.c
> > index 0a42c5df3c0f,ac5bcf449d7d..000000000000
> > --- a/drivers/usb/core/hcd.c
> > +++ b/drivers/usb/core/hcd.c
> > @@@ -2742,35 -2740,11 +2743,15 @@@ int usb_add_hcd(struct usb_hcd *hcd
> >   	int retval;
> >   	struct usb_device *rhdev;
> >   
> > - 	if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->skip_phy_initialization) {
> > - 		struct usb_phy *phy = usb_get_phy_dev(hcd->self.sysdev, 0);
> > - 
> > - 		if (IS_ERR(phy)) {
> > - 			retval = PTR_ERR(phy);
> > - 			if (retval == -EPROBE_DEFER)
> > - 				return retval;
> > - 		} else {
> > - 			retval = usb_phy_init(phy);
> > - 			if (retval) {
> > - 				usb_put_phy(phy);
> > - 				return retval;
> > - 			}
> > - 			hcd->usb_phy = phy;
> > - 			hcd->remove_phy = 1;
> > - 		}
> > - 	}
> > - 
> >   	if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) {
> >  -		hcd->phy_roothub = usb_phy_roothub_init(hcd->self.sysdev);
> >  +		hcd->phy_roothub = usb_phy_roothub_alloc(hcd->self.sysdev);
> > - 		if (IS_ERR(hcd->phy_roothub)) {
> > - 			retval = PTR_ERR(hcd->phy_roothub);
> > - 			goto err_phy_roothub_alloc;
> > - 		}
> > + 		if (IS_ERR(hcd->phy_roothub))
> > + 			return PTR_ERR(hcd->phy_roothub);
> >   
> >  +		retval = usb_phy_roothub_init(hcd->phy_roothub);
> >  +		if (retval)
> > - 			goto err_phy_roothub_alloc;
> > ++			return retval;
> >  +
> >   		retval = usb_phy_roothub_power_on(hcd->phy_roothub);
> >   		if (retval)
> >   			goto err_usb_phy_roothub_power_on;
> 
> This is now a conflict between the battery tree (since it merged the
> usb tree) and Linus' tree (since it merged the usb.current tree).

Thanks for the heads up! I guess using a topic branch for the tcpm
changes would have been the better choice :( As far as I can see
there is not much I can do except for mentioning it to Linus when
I send my pull request.

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2018-04-23  3:04 Stephen Rothwell
  2018-04-23  8:30 ` Johan Hovold
@ 2018-04-30  1:34 ` Stephen Rothwell
  2018-04-30 11:55   ` Sebastian Reichel
  2018-04-30 12:00   ` Greg KH
  1 sibling, 2 replies; 47+ messages in thread
From: Stephen Rothwell @ 2018-04-30  1:34 UTC (permalink / raw)
  To: Greg KH, Sebastian Reichel
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Martin Blumenstingl, Johan Hovold


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

Hi all,

On Mon, 23 Apr 2018 13:04:44 +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/hcd.c
> 
> between commit:
> 
>   63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}")
> 
> from the usb.current tree and commit:
> 
>   bc40f5341741 ("USB: core: hcd: drop support for legacy phys")
> 
> from the usb tree.
> 
> I fixed it up (see below - though I am not sure what happens to the
> phy_roothub allocation when usb_phy_roothub_init fails) and can carry
> the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the
> conflicting tree to minimise any particularly complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/usb/core/hcd.c
> index 0a42c5df3c0f,ac5bcf449d7d..000000000000
> --- a/drivers/usb/core/hcd.c
> +++ b/drivers/usb/core/hcd.c
> @@@ -2742,35 -2740,11 +2743,15 @@@ int usb_add_hcd(struct usb_hcd *hcd
>   	int retval;
>   	struct usb_device *rhdev;
>   
> - 	if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->skip_phy_initialization) {
> - 		struct usb_phy *phy = usb_get_phy_dev(hcd->self.sysdev, 0);
> - 
> - 		if (IS_ERR(phy)) {
> - 			retval = PTR_ERR(phy);
> - 			if (retval == -EPROBE_DEFER)
> - 				return retval;
> - 		} else {
> - 			retval = usb_phy_init(phy);
> - 			if (retval) {
> - 				usb_put_phy(phy);
> - 				return retval;
> - 			}
> - 			hcd->usb_phy = phy;
> - 			hcd->remove_phy = 1;
> - 		}
> - 	}
> - 
>   	if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) {
>  -		hcd->phy_roothub = usb_phy_roothub_init(hcd->self.sysdev);
>  +		hcd->phy_roothub = usb_phy_roothub_alloc(hcd->self.sysdev);
> - 		if (IS_ERR(hcd->phy_roothub)) {
> - 			retval = PTR_ERR(hcd->phy_roothub);
> - 			goto err_phy_roothub_alloc;
> - 		}
> + 		if (IS_ERR(hcd->phy_roothub))
> + 			return PTR_ERR(hcd->phy_roothub);
>   
>  +		retval = usb_phy_roothub_init(hcd->phy_roothub);
>  +		if (retval)
> - 			goto err_phy_roothub_alloc;
> ++			return retval;
>  +
>   		retval = usb_phy_roothub_power_on(hcd->phy_roothub);
>   		if (retval)
>   			goto err_usb_phy_roothub_power_on;

This is now a conflict between the battery tree (since it merged the
usb tree) and Linus' tree (since it merged the usb.current tree).

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2018-04-23  8:30 ` Johan Hovold
@ 2018-04-23  8:41   ` Greg KH
  0 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2018-04-23  8:41 UTC (permalink / raw)
  To: Johan Hovold
  Cc: Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, Martin Blumenstingl

On Mon, Apr 23, 2018 at 10:30:11AM +0200, Johan Hovold wrote:
> On Mon, Apr 23, 2018 at 01:04:44PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the usb tree got a conflict in:
> > 
> >   drivers/usb/core/hcd.c
> > 
> > between commit:
> > 
> >   63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}")
> > 
> > from the usb.current tree and commit:
> > 
> >   bc40f5341741 ("USB: core: hcd: drop support for legacy phys")
> > 
> > from the usb tree.
> > 
> > I fixed it up (see below - though I am not sure what happens to the
> > phy_roothub allocation when usb_phy_roothub_init fails) and can carry
> > the fix as necessary.
> 
> The resolution looks correct to me. The allocations done by
> usb_phy_roothub_alloc() are device managed and would be freed on probe
> failures (or unbind) so not explicit dealloc is needed. It might be a
> good idea to indicate that in the function name however (i.e. to add a
> devm_ prefix).

I'll take this same resolution when the branches get merged, thanks.

And yes, being more explicit would be a good idea for the function
name...

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2018-04-23  3:04 Stephen Rothwell
@ 2018-04-23  8:30 ` Johan Hovold
  2018-04-23  8:41   ` Greg KH
  2018-04-30  1:34 ` Stephen Rothwell
  1 sibling, 1 reply; 47+ messages in thread
From: Johan Hovold @ 2018-04-23  8:30 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Greg KH, Linux-Next Mailing List, Linux Kernel Mailing List,
	Martin Blumenstingl, Johan Hovold

On Mon, Apr 23, 2018 at 01:04:44PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/core/hcd.c
> 
> between commit:
> 
>   63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}")
> 
> from the usb.current tree and commit:
> 
>   bc40f5341741 ("USB: core: hcd: drop support for legacy phys")
> 
> from the usb tree.
> 
> I fixed it up (see below - though I am not sure what happens to the
> phy_roothub allocation when usb_phy_roothub_init fails) and can carry
> the fix as necessary.

The resolution looks correct to me. The allocations done by
usb_phy_roothub_alloc() are device managed and would be freed on probe
failures (or unbind) so not explicit dealloc is needed. It might be a
good idea to indicate that in the function name however (i.e. to add a
devm_ prefix).

Johan

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2018-04-23  3:04 Stephen Rothwell
  2018-04-23  8:30 ` Johan Hovold
  2018-04-30  1:34 ` Stephen Rothwell
  0 siblings, 2 replies; 47+ messages in thread
From: Stephen Rothwell @ 2018-04-23  3:04 UTC (permalink / raw)
  To: Greg KH
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Martin Blumenstingl, Johan Hovold


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/usb/core/hcd.c

between commit:

  63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}")

from the usb.current tree and commit:

  bc40f5341741 ("USB: core: hcd: drop support for legacy phys")

from the usb tree.

I fixed it up (see below - though I am not sure what happens to the
phy_roothub allocation when usb_phy_roothub_init fails) and can carry
the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/usb/core/hcd.c
index 0a42c5df3c0f,ac5bcf449d7d..000000000000
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@@ -2742,35 -2740,11 +2743,15 @@@ int usb_add_hcd(struct usb_hcd *hcd
  	int retval;
  	struct usb_device *rhdev;
  
- 	if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->skip_phy_initialization) {
- 		struct usb_phy *phy = usb_get_phy_dev(hcd->self.sysdev, 0);
- 
- 		if (IS_ERR(phy)) {
- 			retval = PTR_ERR(phy);
- 			if (retval == -EPROBE_DEFER)
- 				return retval;
- 		} else {
- 			retval = usb_phy_init(phy);
- 			if (retval) {
- 				usb_put_phy(phy);
- 				return retval;
- 			}
- 			hcd->usb_phy = phy;
- 			hcd->remove_phy = 1;
- 		}
- 	}
- 
  	if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) {
 -		hcd->phy_roothub = usb_phy_roothub_init(hcd->self.sysdev);
 +		hcd->phy_roothub = usb_phy_roothub_alloc(hcd->self.sysdev);
- 		if (IS_ERR(hcd->phy_roothub)) {
- 			retval = PTR_ERR(hcd->phy_roothub);
- 			goto err_phy_roothub_alloc;
- 		}
+ 		if (IS_ERR(hcd->phy_roothub))
+ 			return PTR_ERR(hcd->phy_roothub);
  
 +		retval = usb_phy_roothub_init(hcd->phy_roothub);
 +		if (retval)
- 			goto err_phy_roothub_alloc;
++			return retval;
 +
  		retval = usb_phy_roothub_power_on(hcd->phy_roothub);
  		if (retval)
  			goto err_usb_phy_roothub_power_on;

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2018-01-03  0:56   ` Stephen Rothwell
@ 2018-01-04 16:06     ` Greg KH
  0 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2018-01-04 16:06 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Shuah Khan,
	Colin Ian King

On Wed, Jan 03, 2018 at 11:56:42AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Wed, 20 Dec 2017 10:36:15 +0100 Greg KH <greg@kroah.com> wrote:
> >
> > Thanks for the fixup, I'll do it when these trees converge in a week or
> > so.
> 
> Unfortunately, it looks like when you back merged Linus' tree (to get
> commit 8272d099d05f) you lost the spelling fix in commit 81d8a8eb0a97.

Colin was good, he just resent it :)

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2017-12-20  9:36 ` Greg KH
@ 2018-01-03  0:56   ` Stephen Rothwell
  2018-01-04 16:06     ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Stephen Rothwell @ 2018-01-03  0:56 UTC (permalink / raw)
  To: Greg KH
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Shuah Khan,
	Colin Ian King

Hi Greg,

On Wed, 20 Dec 2017 10:36:15 +0100 Greg KH <greg@kroah.com> wrote:
>
> Thanks for the fixup, I'll do it when these trees converge in a week or
> so.

Unfortunately, it looks like when you back merged Linus' tree (to get
commit 8272d099d05f) you lost the spelling fix in commit 81d8a8eb0a97.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2017-12-20  2:09 Stephen Rothwell
@ 2017-12-20  9:36 ` Greg KH
  2018-01-03  0:56   ` Stephen Rothwell
  0 siblings, 1 reply; 47+ messages in thread
From: Greg KH @ 2017-12-20  9:36 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Shuah Khan,
	Colin Ian King

On Wed, Dec 20, 2017 at 01:09:49PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/usbip/vhci_rx.c
> 
> between commit:
> 
>   8272d099d05f ("usbip: vhci: stop printing kernel pointer addresses in messages")
> 
> from the usb.current tree and commit:
> 
>   81d8a8eb0a97 ("USB: usbip: fix spelling mistake: "synchronuously" -> "synchronously"")
> 
> from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/usb/usbip/vhci_rx.c
> index 112ebb90d8c9,a9813f1d507d..000000000000
> --- a/drivers/usb/usbip/vhci_rx.c
> +++ b/drivers/usb/usbip/vhci_rx.c
> @@@ -29,9 -30,9 +29,9 @@@ struct urb *pickup_urb_and_free_priv(st
>   		case -ENOENT:
>   			/* fall through */
>   		case -ECONNRESET:
>  -			dev_info(&urb->dev->dev,
>  -				 "urb %p was unlinked %ssynchronously.\n", urb,
>  -				 status == -ENOENT ? "" : "a");
>  +			dev_dbg(&urb->dev->dev,
> - 				 "urb seq# %u was unlinked %ssynchronuously\n",
> ++				 "urb seq# %u was unlinked %ssynchronously\n",
>  +				 seqnum, status == -ENOENT ? "" : "a");
>   			break;
>   		case -EINPROGRESS:
>   			/* no info output */

Thanks for the fixup, I'll do it when these trees converge in a week or
so.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2017-12-20  2:09 Stephen Rothwell
  2017-12-20  9:36 ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Stephen Rothwell @ 2017-12-20  2:09 UTC (permalink / raw)
  To: Greg KH
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Shuah Khan,
	Colin Ian King

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/usb/usbip/vhci_rx.c

between commit:

  8272d099d05f ("usbip: vhci: stop printing kernel pointer addresses in messages")

from the usb.current tree and commit:

  81d8a8eb0a97 ("USB: usbip: fix spelling mistake: "synchronuously" -> "synchronously"")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/usb/usbip/vhci_rx.c
index 112ebb90d8c9,a9813f1d507d..000000000000
--- a/drivers/usb/usbip/vhci_rx.c
+++ b/drivers/usb/usbip/vhci_rx.c
@@@ -29,9 -30,9 +29,9 @@@ struct urb *pickup_urb_and_free_priv(st
  		case -ENOENT:
  			/* fall through */
  		case -ECONNRESET:
 -			dev_info(&urb->dev->dev,
 -				 "urb %p was unlinked %ssynchronously.\n", urb,
 -				 status == -ENOENT ? "" : "a");
 +			dev_dbg(&urb->dev->dev,
- 				 "urb seq# %u was unlinked %ssynchronuously\n",
++				 "urb seq# %u was unlinked %ssynchronously\n",
 +				 seqnum, status == -ENOENT ? "" : "a");
  			break;
  		case -EINPROGRESS:
  			/* no info output */

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2014-11-06  2:19     ` Greg KH
@ 2014-11-06  5:02       ` Stephen Rothwell
  0 siblings, 0 replies; 47+ messages in thread
From: Stephen Rothwell @ 2014-11-06  5:02 UTC (permalink / raw)
  To: Greg KH; +Cc: Paul Bolle, linux-next, linux-kernel, Sylwester Nawrocki


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

Hi all,

On Wed, 5 Nov 2014 18:19:34 -0800 Greg KH <greg@kroah.com> wrote:
>
> On Wed, Nov 05, 2014 at 09:33:33AM +0100, Paul Bolle wrote:
> > On Tue, 2014-11-04 at 20:30 -0800, Greg KH wrote:
> > > On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: 
> > > > Today's linux-next merge of the usb tree got a conflict in
> > > > drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove
> > > > references to non-existent PLAT_S5P symbol") from the usb.current tree
> > > > and commit dd3cf17488b1 ("usb: host: Remove optional dependencies on
> > > > PLAT_S5P") from the usb tree.
> > > > 
> > > > I fixed it up (I used the usb tree version) and can carry the fix as
> > > > necessary (no action is required).
> > > 
> > > That's the correct fix, thanks for doing that.
> > 
> > Shouldn't that be the other way round?
> 
> Sorry, you are right, I read the merge backwards.

OK, I did that in today'y tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2014-11-05  8:33   ` Paul Bolle
@ 2014-11-06  2:19     ` Greg KH
  2014-11-06  5:02       ` Stephen Rothwell
  0 siblings, 1 reply; 47+ messages in thread
From: Greg KH @ 2014-11-06  2:19 UTC (permalink / raw)
  To: Paul Bolle; +Cc: Stephen Rothwell, linux-next, linux-kernel, Sylwester Nawrocki

On Wed, Nov 05, 2014 at 09:33:33AM +0100, Paul Bolle wrote:
> On Tue, 2014-11-04 at 20:30 -0800, Greg KH wrote:
> > On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: 
> > > Today's linux-next merge of the usb tree got a conflict in
> > > drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove
> > > references to non-existent PLAT_S5P symbol") from the usb.current tree
> > > and commit dd3cf17488b1 ("usb: host: Remove optional dependencies on
> > > PLAT_S5P") from the usb tree.
> > > 
> > > I fixed it up (I used the usb tree version) and can carry the fix as
> > > necessary (no action is required).
> > 
> > That's the correct fix, thanks for doing that.
> 
> Shouldn't that be the other way round?

Sorry, you are right, I read the merge backwards.

> I thought we would choose Sylwester's commit from the usb.current tree
> over my commit from the usb tree. Or will Sylwester's commit end up in
> linux-next through yet another usb tree?

I will do that when I do the merge in my tree when it hits Linus's tree.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2014-11-05  4:30 ` Greg KH
@ 2014-11-05  8:33   ` Paul Bolle
  2014-11-06  2:19     ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Paul Bolle @ 2014-11-05  8:33 UTC (permalink / raw)
  To: Greg KH; +Cc: Stephen Rothwell, linux-next, linux-kernel, Sylwester Nawrocki

On Tue, 2014-11-04 at 20:30 -0800, Greg KH wrote:
> On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote: 
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove
> > references to non-existent PLAT_S5P symbol") from the usb.current tree
> > and commit dd3cf17488b1 ("usb: host: Remove optional dependencies on
> > PLAT_S5P") from the usb tree.
> > 
> > I fixed it up (I used the usb tree version) and can carry the fix as
> > necessary (no action is required).
> 
> That's the correct fix, thanks for doing that.

Shouldn't that be the other way round? I thought we would choose
Sylwester's commit from the usb.current tree over my commit from the usb
tree. Or will Sylwester's commit end up in linux-next through yet
another usb tree?


Paul Bolle

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2014-11-05  4:18 Stephen Rothwell
@ 2014-11-05  4:30 ` Greg KH
  2014-11-05  8:33   ` Paul Bolle
  0 siblings, 1 reply; 47+ messages in thread
From: Greg KH @ 2014-11-05  4:30 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Paul Bolle, Sylwester Nawrocki

On Wed, Nov 05, 2014 at 03:18:25PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove
> references to non-existent PLAT_S5P symbol") from the usb.current tree
> and commit dd3cf17488b1 ("usb: host: Remove optional dependencies on
> PLAT_S5P") from the usb tree.
> 
> I fixed it up (I used the usb tree version) and can carry the fix as
> necessary (no action is required).

That's the correct fix, thanks for doing that.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2014-11-05  4:18 Stephen Rothwell
  2014-11-05  4:30 ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Stephen Rothwell @ 2014-11-05  4:18 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Paul Bolle, Sylwester Nawrocki


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove
references to non-existent PLAT_S5P symbol") from the usb.current tree
and commit dd3cf17488b1 ("usb: host: Remove optional dependencies on
PLAT_S5P") from the usb tree.

I fixed it up (I used the usb tree version) 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 --]

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2013-12-18  5:53 Stephen Rothwell
  0 siblings, 0 replies; 47+ messages in thread
From: Stephen Rothwell @ 2013-12-18  5:53 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Boris BREZILLON, Peter Chen


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ohci-at91.c between commit fb5f1834c322 ("usb:
ohci-at91: fix irq and iomem resource retrieval") from the usb.current
tree and commit 3c9740a117d4 ("usb: hcd: move controller wakeup setting
initialization to individual 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/ohci-at91.c
index 8c356af79409,29d2093e3cee..000000000000
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@@ -203,9 -199,11 +203,11 @@@ static int usb_hcd_at91_probe(const str
  	ohci->num_ports = board->ports;
  	at91_start_hc(pdev);
  
 -	retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED);
 +	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
- 	if (retval == 0)
+ 	if (retval == 0) {
+ 		device_wakeup_enable(hcd->self.controller);
  		return retval;
+ 	}
  
  	/* Error handling */
  	at91_stop_hc(pdev);

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2013-03-21  4:24 Stephen Rothwell
  0 siblings, 0 replies; 47+ messages in thread
From: Stephen Rothwell @ 2013-03-21  4:24 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Alan Stern


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-timer.c between commit d714aaf64946 ("USB: EHCI:
fix regression in QH unlinking") from the usb.current tree and commit
60fd4aa742a0 ("USB: EHCI: reorganize ehci_iaa_watchdog()") from the usb
tree.

I assume that the latter fixed the problem fixed by the former, so just
used the latter 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] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2012-11-14  4:07 Stephen Rothwell
@ 2012-11-16  2:14 ` Greg KH
  0 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2012-11-16  2:14 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Florian Fainelli

On Wed, Nov 14, 2012 at 03:07:46PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got conflicts in
> drivers/usb/host/ehci-ls1x.c and drivers/usb/host/ohci-xls.c between
> commit e592c5d0b7db ("Revert "USB/host: Cleanup unneccessary irq disable
> code"") from the usb.current tree and commits ead92fae1290 ("USB: EHCI:
> remove Loongson 1B EHCI driver") and c2e91e046df6 ("USB: OHCI: remove
> Netlogic XLS OHCI platform driver") from the usb tree.
> 
> The latter removed the files, so I just did that and can carry the fix as
> necessary (no action is required).

Thanks, that sounds correct.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2012-11-14  4:07 Stephen Rothwell
  2012-11-16  2:14 ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Stephen Rothwell @ 2012-11-14  4:07 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Florian Fainelli


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

Hi Greg,

Today's linux-next merge of the usb tree got conflicts in
drivers/usb/host/ehci-ls1x.c and drivers/usb/host/ohci-xls.c between
commit e592c5d0b7db ("Revert "USB/host: Cleanup unneccessary irq disable
code"") from the usb.current tree and commits ead92fae1290 ("USB: EHCI:
remove Loongson 1B EHCI driver") and c2e91e046df6 ("USB: OHCI: remove
Netlogic XLS OHCI platform driver") from the usb tree.

The latter removed the files, 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] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2012-11-13  3:37 Stephen Rothwell
@ 2012-11-13 18:49 ` Greg KH
  0 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2012-11-13 18:49 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Wei Yongjun, Felipe Balbi,
	Sebastian Andrzej Siewior

On Tue, Nov 13, 2012 at 02:37:32PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/musb/ux500.c between commit 9a65d162e449 ("usb: musb: ux500:
> fix 'musbid' undeclared error in ux500_remove()") from the usb.current
> tree and commit 2f7711642559 ("usb: musb: remove hand-crafted id
> handling") from the usb tree.
> 
> The latter supercedes the former so I used that and can carry the fix as
> necessary (no action is required).

That is fine, thanks for doing this.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2012-11-13  3:37 Stephen Rothwell
  2012-11-13 18:49 ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Stephen Rothwell @ 2012-11-13  3:37 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Wei Yongjun, Felipe Balbi,
	Sebastian Andrzej Siewior


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/musb/ux500.c between commit 9a65d162e449 ("usb: musb: ux500:
fix 'musbid' undeclared error in ux500_remove()") from the usb.current
tree and commit 2f7711642559 ("usb: musb: remove hand-crafted id
handling") from the usb tree.

The latter supercedes the former so I used 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] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2012-10-25  2:05 Stephen Rothwell
@ 2012-10-25  2:17 ` Greg KH
  0 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2012-10-25  2:17 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dave Jones

On Thu, Oct 25, 2012 at 01:05:45PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/misc/ezusb.c between commit 197ef5ef37d9 ("USB: Add missing
> license tag to ezusb driver") from the usb.current tree and commitc
> 30186e51e53 ("USB: ezusb: unexport some functions that aren't being
> used") 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] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2012-10-25  2:05 Stephen Rothwell
  2012-10-25  2:17 ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Stephen Rothwell @ 2012-10-25  2:05 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Dave Jones


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/misc/ezusb.c between commit 197ef5ef37d9 ("USB: Add missing
license tag to ezusb driver") from the usb.current tree and commitc
30186e51e53 ("USB: ezusb: unexport some functions that aren't being
used") 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/misc/ezusb.c
index 6589268,0a48de9..0000000
--- a/drivers/usb/misc/ezusb.c
+++ b/drivers/usb/misc/ezusb.c
@@@ -157,5 -162,4 +162,6 @@@ int ezusb_fx2_ihex_firmware_download(st
  	return ezusb_ihex_firmware_download(dev, ezusb_fx2, firmware_path);
  }
  EXPORT_SYMBOL_GPL(ezusb_fx2_ihex_firmware_download);
+ #endif
 +
 +MODULE_LICENSE("GPL");

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2012-09-12  5:37 Stephen Rothwell
@ 2012-09-12 16:14 ` Greg KH
  0 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2012-09-12 16:14 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Pratyush Anand, Felipe Balbi, Moiz Sonasath

On Wed, Sep 12, 2012 at 03:37:56PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/dwc3/gadget.c between commit f4a53c55117b ("usb: dwc3:
> gadget: fix pending isoc handling") from the usb.current tree and commit
> 348e026fafe2 ("usb: dwc3: gadget: Fix sparse warnings") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for the warning, I'll resolve this when Linus pulls from this
tree later this week.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2012-09-12  5:37 Stephen Rothwell
  2012-09-12 16:14 ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Stephen Rothwell @ 2012-09-12  5:37 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Pratyush Anand, Felipe Balbi, Moiz Sonasath


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/dwc3/gadget.c between commit f4a53c55117b ("usb: dwc3:
gadget: fix pending isoc handling") from the usb.current tree and commit
348e026fafe2 ("usb: dwc3: gadget: Fix sparse warnings") 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/dwc3/gadget.c
index c2813c2b,ba444e7..0000000
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -1091,26 -1078,10 +1082,21 @@@ static int __dwc3_gadget_ep_queue(struc
  	 *
  	 */
  	if (dep->flags & DWC3_EP_PENDING_REQUEST) {
- 		int	ret;
- 
 +		/*
 +		 * If xfernotready is already elapsed and it is a case
 +		 * of isoc transfer, then issue END TRANSFER, so that
 +		 * you can receive xfernotready again and can have
 +		 * notion of current microframe.
 +		 */
 +		if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
 +			dwc3_stop_active_transfer(dwc, dep->number);
 +			return 0;
 +		}
 +
  		ret = __dwc3_gadget_kick_transfer(dep, 0, true);
- 		if (ret && ret != -EBUSY) {
- 			struct dwc3	*dwc = dep->dwc;
- 
+ 		if (ret && ret != -EBUSY)
  			dev_dbg(dwc->dev, "%s: failed to kick transfers\n",
  					dep->name);
- 		}
  	}
  
  	/*

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2012-09-12  5:37 Stephen Rothwell
  0 siblings, 0 replies; 47+ messages in thread
From: Stephen Rothwell @ 2012-09-12  5:37 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Sergei Shtylyov, Felipe Balbi,
	Ravi Babu, Ajay Kumar Gupta, Santhapuri, Damodar


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/musb/tusb6010.c between commit ff41aaa3b6c1 ("usb: musb:
tusb6010: fix error path in tusb_probe()") from the usb.current tree and
commit 65b3d52d02a5 ("usb: musb: add musb_ida for multi instance
support") from the usb tree.

They both updated the same goto - I used the latter (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] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2012-05-03  4:44 Stephen Rothwell
  2012-05-04 23:18 ` Greg KH
  2012-05-07 16:05 ` Greg KH
@ 2012-05-07 16:05 ` Greg KH
  2 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2012-05-07 16:05 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Alan Stern, Stephen Warren, Venu Byravarasu

On Thu, May 03, 2012 at 02:44:10PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit ebf20de45304 ("EHCI: update
> PM methods in ehci-tegra.c") from the usb.current tree and commit
> fe375774bd88 ("usb: host: tegra: code clean up") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

This should now be resolved in my tree, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2012-05-03  4:44 Stephen Rothwell
  2012-05-04 23:18 ` Greg KH
@ 2012-05-07 16:05 ` Greg KH
  2012-05-07 16:05 ` Greg KH
  2 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2012-05-07 16:05 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Alan Stern, Stephen Warren, Venu Byravarasu

On Thu, May 03, 2012 at 02:44:10PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit ebf20de45304 ("EHCI: update
> PM methods in ehci-tegra.c") from the usb.current tree and commit
> fe375774bd88 ("usb: host: tegra: code clean up") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

This should now be resolved in my tree.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2012-05-03  4:44 Stephen Rothwell
@ 2012-05-04 23:18 ` Greg KH
  2012-05-07 16:05 ` Greg KH
  2012-05-07 16:05 ` Greg KH
  2 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2012-05-04 23:18 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Alan Stern, Stephen Warren, Venu Byravarasu

On Thu, May 03, 2012 at 02:44:10PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit ebf20de45304 ("EHCI: update
> PM methods in ehci-tegra.c") from the usb.current tree and commit
> fe375774bd88 ("usb: host: tegra: code clean up") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, that looks correct, I'll resolve the merge in my tree when -rc6
comes out.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2012-05-03  4:44 Stephen Rothwell
  2012-05-04 23:18 ` Greg KH
                   ` (2 more replies)
  0 siblings, 3 replies; 47+ messages in thread
From: Stephen Rothwell @ 2012-05-03  4:44 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Alan Stern, Stephen Warren, Venu Byravarasu


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-tegra.c between commit ebf20de45304 ("EHCI: update
PM methods in ehci-tegra.c") from the usb.current tree and commit
fe375774bd88 ("usb: host: tegra: code clean up") from the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/host/ehci-tegra.c
index f214a80,4c1eb61..0000000
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -319,7 -423,37 +308,7 @@@ static int tegra_ehci_setup(struct usb_
  	return retval;
  }
  
- struct temp_buffer {
 -#ifdef CONFIG_PM
 -static int tegra_ehci_bus_suspend(struct usb_hcd *hcd)
 -{
 -	struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
 -	int error_status = 0;
 -
 -	error_status = ehci_bus_suspend(hcd);
 -	if (!error_status && tegra->power_down_on_bus_suspend) {
 -		tegra_usb_suspend(hcd);
 -		tegra->bus_suspended = 1;
 -	}
 -
 -	return error_status;
 -}
 -
 -static int tegra_ehci_bus_resume(struct usb_hcd *hcd)
 -{
 -	struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
 -
 -	if (tegra->bus_suspended && tegra->power_down_on_bus_suspend) {
 -		tegra_usb_resume(hcd);
 -		tegra->bus_suspended = 0;
 -	}
 -
 -	tegra_usb_phy_preresume(tegra->phy);
 -	tegra->port_resuming = 1;
 -	return ehci_bus_resume(hcd);
 -}
 -#endif
 -
+ struct dma_aligned_buffer {
  	void *kmalloc_ptr;
  	void *old_xfer_buffer;
  	u8 data[0];
@@@ -426,14 -548,20 +403,20 @@@ static const struct hc_driver tegra_ehc
  	.endpoint_reset		= ehci_endpoint_reset,
  	.get_frame_number	= ehci_get_frame,
  	.hub_status_data	= ehci_hub_status_data,
- 	.hub_control		= tegra_ehci_hub_control,
  	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
+ 	.relinquish_port	= ehci_relinquish_port,
+ 	.port_handed_over	= ehci_port_handed_over,
+ 
+ 	/* modified ehci functions for tegra */
+ 	.reset			= tegra_ehci_setup,
+ 	.shutdown		= tegra_ehci_shutdown,
+ 	.map_urb_for_dma	= tegra_ehci_map_urb_for_dma,
+ 	.unmap_urb_for_dma	= tegra_ehci_unmap_urb_for_dma,
+ 	.hub_control		= tegra_ehci_hub_control,
  #ifdef CONFIG_PM
 -	.bus_suspend		= tegra_ehci_bus_suspend,
 -	.bus_resume		= tegra_ehci_bus_resume,
 +	.bus_suspend		= ehci_bus_suspend,
 +	.bus_resume		= ehci_bus_resume,
  #endif
- 	.relinquish_port	= ehci_relinquish_port,
- 	.port_handed_over	= ehci_port_handed_over,
  };
  
  static int setup_vbus_gpio(struct platform_device *pdev)

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2012-04-19  5:14 Stephen Rothwell
  2012-04-19 20:07 ` Greg KH
@ 2012-04-22 22:27 ` Greg KH
  1 sibling, 0 replies; 47+ messages in thread
From: Greg KH @ 2012-04-22 22:27 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Anatolij Gustschin, Ramneek Mehresh

On Thu, Apr 19, 2012 at 03:14:02PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-fsl.c between commit f941f6922533 ("USB: ehci-fsl:
> Fix kernel crash on mpc5121e") from the usb.current tree and commit
> 58c559e6509f ("fsl/usb: Add controller version based ULPI and UTMI phy
> support") from the usb tree.
> 
> I fixed it up (using the pdata assignment from the latter commit) and
> can carry the fix as necessary.

This should now be resolved in my tree.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2012-04-19  5:14 Stephen Rothwell
@ 2012-04-19 20:07 ` Greg KH
  2012-04-22 22:27 ` Greg KH
  1 sibling, 0 replies; 47+ messages in thread
From: Greg KH @ 2012-04-19 20:07 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Anatolij Gustschin, Ramneek Mehresh

On Thu, Apr 19, 2012 at 03:14:02PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-fsl.c between commit f941f6922533 ("USB: ehci-fsl:
> Fix kernel crash on mpc5121e") from the usb.current tree and commit
> 58c559e6509f ("fsl/usb: Add controller version based ULPI and UTMI phy
> support") from the usb tree.
> 
> I fixed it up (using the pdata assignment from the latter commit) and
> can carry the fix as necessary.

Thanks, that sounds correct, I'll fix this up when the patches in
usb.current get pushed to Linus.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2012-04-19  5:14 Stephen Rothwell
  2012-04-19 20:07 ` Greg KH
  2012-04-22 22:27 ` Greg KH
  0 siblings, 2 replies; 47+ messages in thread
From: Stephen Rothwell @ 2012-04-19  5:14 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Anatolij Gustschin, Ramneek Mehresh


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-fsl.c between commit f941f6922533 ("USB: ehci-fsl:
Fix kernel crash on mpc5121e") from the usb.current tree and commit
58c559e6509f ("fsl/usb: Add controller version based ULPI and UTMI phy
support") from the usb tree.

I fixed it up (using the pdata assignment from the latter commit) and
can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2012-03-05  6:00 Stephen Rothwell
@ 2012-03-05 16:42 ` Greg KH
  0 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2012-03-05 16:42 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Shengzhou Liu

On Mon, Mar 05, 2012 at 05:00:04PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-fsl.h between commit 71919403dc86 ("Revert
> "powerpc/usb: fix issue of CPU halt when missing USB PHY clock"") from
> the usb.current tree and commit 28c56ea14314 ("powerpc/usb: fix bug of
> kernel hang when initializing usb") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Looks good, thanks for this, I'll handle the merge when Linus takes my
usb-linus tree in a few days.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2012-03-05  6:00 Stephen Rothwell
  2012-03-05 16:42 ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Stephen Rothwell @ 2012-03-05  6:00 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Shengzhou Liu


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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-fsl.h between commit 71919403dc86 ("Revert
"powerpc/usb: fix issue of CPU halt when missing USB PHY clock"") from
the usb.current tree and commit 28c56ea14314 ("powerpc/usb: fix bug of
kernel hang when initializing usb") from the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/host/ehci-fsl.h
index 4918062,863fb0c..0000000
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@@ -45,5 -47,7 +47,6 @@@
  #define FSL_SOC_USB_PRICTRL	0x40c	/* NOTE: big-endian */
  #define FSL_SOC_USB_SICTRL	0x410	/* NOTE: big-endian */
  #define FSL_SOC_USB_CTRL	0x500	/* NOTE: big-endian */
+ #define CTRL_UTMI_PHY_EN	(1<<9)
 -#define CTRL_PHY_CLK_VALID	(1 << 17)
  #define SNOOP_SIZE_2GB		0x1e
  #endif				/* _EHCI_FSL_H */

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

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2011-08-25  4:52 Stephen Rothwell
  2011-08-25 15:39 ` Greg KH
@ 2011-08-29 15:52 ` Greg KH
  1 sibling, 0 replies; 47+ messages in thread
From: Greg KH @ 2011-08-29 15:52 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Kuninori Morimoto, Sarah Sharp

On Thu, Aug 25, 2011 at 02:52:06PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/xhci-ring.c between commit 48df4a6fd8c4 ("xhci: Handle
> zero-length isochronous packets") from the usb.current tree and commit
> 29cc88979a88 ("USB: use usb_endpoint_maxp() instead of le16_to_cpu()")
> from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

I've resolved this in my tree now so you should no longer need this.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2011-08-25  4:52 Stephen Rothwell
@ 2011-08-25 15:39 ` Greg KH
  2011-08-29 15:52 ` Greg KH
  1 sibling, 0 replies; 47+ messages in thread
From: Greg KH @ 2011-08-25 15:39 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Kuninori Morimoto, Sarah Sharp

On Thu, Aug 25, 2011 at 02:52:06PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/xhci-ring.c between commit 48df4a6fd8c4 ("xhci: Handle
> zero-length isochronous packets") from the usb.current tree and commit
> 29cc88979a88 ("USB: use usb_endpoint_maxp() instead of le16_to_cpu()")
> from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, when I get the usb.current tree merged with Linus, I'll handle
this merge in the usb.next tree.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2011-08-25  4:52 Stephen Rothwell
  2011-08-25 15:39 ` Greg KH
  2011-08-29 15:52 ` Greg KH
  0 siblings, 2 replies; 47+ messages in thread
From: Stephen Rothwell @ 2011-08-25  4:52 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Kuninori Morimoto, Sarah Sharp

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/xhci-ring.c between commit 48df4a6fd8c4 ("xhci: Handle
zero-length isochronous packets") from the usb.current tree and commit
29cc88979a88 ("USB: use usb_endpoint_maxp() instead of le16_to_cpu()")
from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
diff --cc drivers/usb/host/xhci-ring.c
index 54139a2,bf0b52c..0000000
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@@ -3249,11 -3237,9 +3249,11 @@@ static int xhci_queue_isoc_tx(struct xh
  		addr = start_addr + urb->iso_frame_desc[i].offset;
  		td_len = urb->iso_frame_desc[i].length;
  		td_remain_len = td_len;
 -		/* FIXME: Ignoring zero-length packets, can those happen? */
  		total_packet_count = roundup(td_len,
- 				le16_to_cpu(urb->ep->desc.wMaxPacketSize));
+ 				usb_endpoint_maxp(&urb->ep->desc));
 +		/* A zero-length transfer still involves at least one packet. */
 +		if (total_packet_count == 0)
 +			total_packet_count++;
  		burst_count = xhci_get_burst_count(xhci, urb->dev, urb,
  				total_packet_count);
  		residue = xhci_get_last_burst_packet_count(xhci,

^ permalink raw reply	[flat|nested] 47+ messages in thread

* Re: linux-next: manual merge of the usb tree with the usb.current tree
  2010-12-20  5:28 Stephen Rothwell
@ 2010-12-20 18:30 ` Greg KH
  0 siblings, 0 replies; 47+ messages in thread
From: Greg KH @ 2010-12-20 18:30 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Marek Belisko

On Mon, Dec 20, 2010 at 04:28:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/gadget/composite.c between commit
> dbb442b85a1d82f91cfe0524c4f9b3a5196a10ca ("Revert "USB: gadget: Allow
> function access to device ID data during bind()"") from the usb.current
> tree and commit 78bff3c65df33da47e93736bd8847b694084e5a9 ("USB: gadget:
> composite: Typo fix") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, I'll need this later when this goes to Linus today and I merge
in the usb-next branch.

greg k-h

^ permalink raw reply	[flat|nested] 47+ messages in thread

* linux-next: manual merge of the usb tree with the usb.current tree
@ 2010-12-20  5:28 Stephen Rothwell
  2010-12-20 18:30 ` Greg KH
  0 siblings, 1 reply; 47+ messages in thread
From: Stephen Rothwell @ 2010-12-20  5:28 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Marek Belisko

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/composite.c between commit
dbb442b85a1d82f91cfe0524c4f9b3a5196a10ca ("Revert "USB: gadget: Allow
function access to device ID data during bind()"") from the usb.current
tree and commit 78bff3c65df33da47e93736bd8847b694084e5a9 ("USB: gadget:
composite: Typo fix") from the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/gadget/composite.c
index 8572dad,21dc0da..0000000
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@@ -1118,15 -1126,7 +1118,15 @@@ static int composite_bind(struct usb_ga
  	cdev->desc = *composite->dev;
  	cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
  
 +	/* standardized runtime overrides for device ID data */
 +	if (idVendor)
 +		cdev->desc.idVendor = cpu_to_le16(idVendor);
 +	if (idProduct)
 +		cdev->desc.idProduct = cpu_to_le16(idProduct);
 +	if (bcdDevice)
 +		cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);
 +
- 	/* stirng overrides */
+ 	/* string overrides */
  	if (iManufacturer || !cdev->desc.iManufacturer) {
  		if (!iManufacturer && !composite->iManufacturer &&
  		    !*composite_manufacturer)

^ permalink raw reply	[flat|nested] 47+ messages in thread

end of thread, back to index

Thread overview: 47+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-26  3:29 linux-next: manual merge of the usb tree with the usb.current tree Stephen Rothwell
2020-06-26 15:14 ` Greg KH
2020-06-29  6:23 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2018-06-29  4:57 Stephen Rothwell
2018-07-01  8:43 ` Greg KH
2018-07-01 15:11   ` Randy Dunlap
2018-04-23  3:04 Stephen Rothwell
2018-04-23  8:30 ` Johan Hovold
2018-04-23  8:41   ` Greg KH
2018-04-30  1:34 ` Stephen Rothwell
2018-04-30 11:55   ` Sebastian Reichel
2018-04-30 12:16     ` Greg KH
2018-04-30 12:00   ` Greg KH
2017-12-20  2:09 Stephen Rothwell
2017-12-20  9:36 ` Greg KH
2018-01-03  0:56   ` Stephen Rothwell
2018-01-04 16:06     ` Greg KH
2014-11-05  4:18 Stephen Rothwell
2014-11-05  4:30 ` Greg KH
2014-11-05  8:33   ` Paul Bolle
2014-11-06  2:19     ` Greg KH
2014-11-06  5:02       ` Stephen Rothwell
2013-12-18  5:53 Stephen Rothwell
2013-03-21  4:24 Stephen Rothwell
2012-11-14  4:07 Stephen Rothwell
2012-11-16  2:14 ` Greg KH
2012-11-13  3:37 Stephen Rothwell
2012-11-13 18:49 ` Greg KH
2012-10-25  2:05 Stephen Rothwell
2012-10-25  2:17 ` Greg KH
2012-09-12  5:37 Stephen Rothwell
2012-09-12 16:14 ` Greg KH
2012-09-12  5:37 Stephen Rothwell
2012-05-03  4:44 Stephen Rothwell
2012-05-04 23:18 ` Greg KH
2012-05-07 16:05 ` Greg KH
2012-05-07 16:05 ` Greg KH
2012-04-19  5:14 Stephen Rothwell
2012-04-19 20:07 ` Greg KH
2012-04-22 22:27 ` Greg KH
2012-03-05  6:00 Stephen Rothwell
2012-03-05 16:42 ` Greg KH
2011-08-25  4:52 Stephen Rothwell
2011-08-25 15:39 ` Greg KH
2011-08-29 15:52 ` Greg KH
2010-12-20  5:28 Stephen Rothwell
2010-12-20 18:30 ` Greg KH

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git