Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2020-05-21  7:21 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2020-05-21  7:21 UTC (permalink / raw)
  To: Felipe Balbi, Greg KH
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jason Yan,
	kbuild test robot


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

Hi all,

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

  drivers/usb/cdns3/gadget.c

between commit:

  e9010320f2d9 ("usb: cdns3: gadget: make a bunch of functions static")

from the usb tree and commit:

  e2e77a94078b ("usb: cdns3: mark local functions static")

from the usb-gadget tree.

I fixed it up (the difference was the indentation of contiuation lines -
I juts used the latter) 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

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

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

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2020-03-16  3:23 Stephen Rothwell
  2020-03-16  7:25 ` Greg KH
@ 2020-03-16  8:18 ` Greg KH
  1 sibling, 0 replies; 23+ messages in thread
From: Greg KH @ 2020-03-16  8:18 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Felipe Balbi, Linux Next Mailing List, Linux Kernel Mailing List,
	Heikki Krogerus, Hanjie Lin, Yue Wang

On Mon, Mar 16, 2020 at 02:23:09PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in:
> 
>   drivers/usb/dwc3/dwc3-meson-g12a.c
> 
> between commit:
> 
>   bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")
> 
> from the usb tree and commit:
> 
>   1e355f21d3fb ("usb: dwc3: Add Amlogic A1 DWC3 glue")
> 
> from the usb-gadget 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.

Thanks, this matched up with my merge, I've now done this in my tree.

greg k-h

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

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2020-03-16  3:23 Stephen Rothwell
@ 2020-03-16  7:25 ` Greg KH
  2020-03-16  8:18 ` Greg KH
  1 sibling, 0 replies; 23+ messages in thread
From: Greg KH @ 2020-03-16  7:25 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Felipe Balbi, Linux Next Mailing List, Linux Kernel Mailing List,
	Heikki Krogerus, Hanjie Lin, Yue Wang

On Mon, Mar 16, 2020 at 02:23:09PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in:
> 
>   drivers/usb/dwc3/dwc3-meson-g12a.c
> 
> between commit:
> 
>   bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")
> 
> from the usb tree and commit:
> 
>   1e355f21d3fb ("usb: dwc3: Add Amlogic A1 DWC3 glue")
> 
> from the usb-gadget tree.

Thanks for this, I just hit this issue as I just merged the gadget tree
into mine.  I'll queue it up into my tree...

thanks,

greg k-h

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

* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2020-03-16  3:23 Stephen Rothwell
  2020-03-16  7:25 ` Greg KH
  2020-03-16  8:18 ` Greg KH
  0 siblings, 2 replies; 23+ messages in thread
From: Stephen Rothwell @ 2020-03-16  3:23 UTC (permalink / raw)
  To: Felipe Balbi, Greg KH
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Heikki Krogerus, Hanjie Lin, Yue Wang


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

Hi all,

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

  drivers/usb/dwc3/dwc3-meson-g12a.c

between commit:

  bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")

from the usb tree and commit:

  1e355f21d3fb ("usb: dwc3: Add Amlogic A1 DWC3 glue")

from the usb-gadget 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/dwc3/dwc3-meson-g12a.c
index 3309ce90ca14,902553f39889..000000000000
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@@ -381,6 -408,53 +409,54 @@@ static struct device *dwc3_meson_g12_fi
  	return &pdev->dev;
  }
  
+ static int dwc3_meson_g12a_otg_init(struct platform_device *pdev,
+ 				    struct dwc3_meson_g12a *priv)
+ {
+ 	enum phy_mode otg_id;
+ 	int ret, irq;
+ 	struct device *dev = &pdev->dev;
+ 
+ 	if (!priv->drvdata->otg_switch_supported)
+ 		return 0;
+ 
+ 	if (priv->otg_mode == USB_DR_MODE_OTG) {
+ 		/* Ack irq before registering */
+ 		regmap_update_bits(priv->regmap, USB_R5,
+ 				   USB_R5_ID_DIG_IRQ, 0);
+ 
+ 		irq = platform_get_irq(pdev, 0);
+ 		ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+ 						dwc3_meson_g12a_irq_thread,
+ 						IRQF_ONESHOT, pdev->name, priv);
+ 		if (ret)
+ 			return ret;
+ 	}
+ 
+ 	/* Setup OTG mode corresponding to the ID pin */
+ 	if (priv->otg_mode == USB_DR_MODE_OTG) {
+ 		otg_id = dwc3_meson_g12a_get_id(priv);
+ 		if (otg_id != priv->otg_phy_mode) {
+ 			if (dwc3_meson_g12a_otg_mode_set(priv, otg_id))
+ 				dev_warn(dev, "Failed to switch OTG mode\n");
+ 		}
+ 	}
+ 
+ 	/* Setup role switcher */
+ 	priv->switch_desc.usb2_port = dwc3_meson_g12_find_child(dev,
+ 								"snps,dwc3");
+ 	priv->switch_desc.udc = dwc3_meson_g12_find_child(dev, "snps,dwc2");
+ 	priv->switch_desc.allow_userspace_control = true;
+ 	priv->switch_desc.set = dwc3_meson_g12a_role_set;
+ 	priv->switch_desc.get = dwc3_meson_g12a_role_get;
++	priv->switch_desc.driver_data = priv;
+ 
+ 	priv->role_switch = usb_role_switch_register(dev, &priv->switch_desc);
+ 	if (IS_ERR(priv->role_switch))
+ 		dev_warn(dev, "Unable to register Role Switch\n");
+ 
+ 	return 0;
+ }
+ 
  static int dwc3_meson_g12a_probe(struct platform_device *pdev)
  {
  	struct dwc3_meson_g12a	*priv;

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

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

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2018-05-17  4:03 Stephen Rothwell
@ 2018-05-17  7:07 ` Greg KH
  0 siblings, 0 replies; 23+ messages in thread
From: Greg KH @ 2018-05-17  7:07 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Felipe Balbi, Linux-Next Mailing List, Linux Kernel Mailing List,
	Geert Uytterhoeven, Chunfeng Yun

On Thu, May 17, 2018 at 02:03:18PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in:
> 
>   drivers/usb/mtu3/Kconfig
> 
> between commit:
> 
>   cd91a0e9d38f ("usb: Remove depends on HAS_DMA in case of platform dependency")
> 
> from the usb tree and commit:
> 
>   f39846824cd6 ("usb: mtu3: make USB_MTU3_DUAL_ROLE depend on EXTCON but not USB_MTU3")
> 
> from the usb-gadget 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/mtu3/Kconfig
> index c0c0eb88e5ea,8daf27768888..000000000000
> --- a/drivers/usb/mtu3/Kconfig
> +++ b/drivers/usb/mtu3/Kconfig
> @@@ -2,7 -2,7 +2,7 @@@
>   
>   config USB_MTU3
>   	tristate "MediaTek USB3 Dual Role controller"
> - 	depends on EXTCON && (USB || USB_GADGET)
>  -	depends on (USB || USB_GADGET) && HAS_DMA
> ++	depends on (USB || USB_GADGET)
>   	depends on ARCH_MEDIATEK || COMPILE_TEST
>   	select USB_XHCI_MTK if USB_SUPPORT && USB_XHCI_HCD
>   	help

Looks good to me, thanks!

greg k-h

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

* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2018-05-17  4:03 Stephen Rothwell
  2018-05-17  7:07 ` Greg KH
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2018-05-17  4:03 UTC (permalink / raw)
  To: Felipe Balbi, Greg KH
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Geert Uytterhoeven, Chunfeng Yun


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

Hi all,

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

  drivers/usb/mtu3/Kconfig

between commit:

  cd91a0e9d38f ("usb: Remove depends on HAS_DMA in case of platform dependency")

from the usb tree and commit:

  f39846824cd6 ("usb: mtu3: make USB_MTU3_DUAL_ROLE depend on EXTCON but not USB_MTU3")

from the usb-gadget 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/mtu3/Kconfig
index c0c0eb88e5ea,8daf27768888..000000000000
--- a/drivers/usb/mtu3/Kconfig
+++ b/drivers/usb/mtu3/Kconfig
@@@ -2,7 -2,7 +2,7 @@@
  
  config USB_MTU3
  	tristate "MediaTek USB3 Dual Role controller"
- 	depends on EXTCON && (USB || USB_GADGET)
 -	depends on (USB || USB_GADGET) && HAS_DMA
++	depends on (USB || USB_GADGET)
  	depends on ARCH_MEDIATEK || COMPILE_TEST
  	select USB_XHCI_MTK if USB_SUPPORT && USB_XHCI_HCD
  	help

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

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

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2017-10-18 15:40 ` Kees Cook
@ 2017-10-19  7:37   ` Felipe Balbi
  0 siblings, 0 replies; 23+ messages in thread
From: Felipe Balbi @ 2017-10-19  7:37 UTC (permalink / raw)
  To: Kees Cook, Mark Brown
  Cc: Greg Kroah-Hartman, Allen Pais, linux-usb,
	Linux-Next Mailing List, Linux Kernel Mailing List


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


Hi,

Kees Cook <keescook@chromium.org> writes:
> On Wed, Oct 18, 2017 at 7:42 AM, Mark Brown <broonie@kernel.org> wrote:
>> Hi Felipe,
>>
>> Today's linux-next merge of the usb-gadget tree got a conflict in:
>>
>>   drivers/usb/gadget/udc/snps_udc_core.c
>>
>> between commit:
>>
>>   29bce57723351f63d ("usb/gadget/snps_udc_core: Convert timers to use timer_setup()")
>>
>> from the usb tree and commit:
>>
>>   46b614affda8667f9 ("usb: gadget: udc: snps_udc_core: use setup_timer() helper.")
>>
>> from the usb-gadget tree.
>>
>> I fixed it up by taking the USB version 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.
>
> FWIW, timer_setup() should be preferred over setup_timer().

I'll drop the one from my tree.

thanks

-- 
balbi

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

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

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2017-10-18 15:40   ` Kees Cook
@ 2017-10-18 16:04     ` Mark Brown
  0 siblings, 0 replies; 23+ messages in thread
From: Mark Brown @ 2017-10-18 16:04 UTC (permalink / raw)
  To: Kees Cook
  Cc: Felipe Balbi, Tony Lindgren, Felipe Balbi, Greg Kroah-Hartman,
	Allen Pais, linux-omap, linux-usb, Linux-Next Mailing List,
	Linux Kernel Mailing List


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

On Wed, Oct 18, 2017 at 08:40:04AM -0700, Kees Cook wrote:
> On Wed, Oct 18, 2017 at 7:49 AM, Mark Brown <broonie@kernel.org> wrote:

> > I fixed it up with the USB version 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.

> FWIW, timer_setup() should be preferred over setup_timer().

Bah, that's unfortunate.  When more of these come up I'll do that.  It
would be better to sort these out in the relevant trees though, there's
quite a few of these conflicts and it's not super obvious if you're not
into the timer code what's preferred.

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

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

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2017-10-18 14:42 Mark Brown
@ 2017-10-18 15:40 ` Kees Cook
  2017-10-19  7:37   ` Felipe Balbi
  0 siblings, 1 reply; 23+ messages in thread
From: Kees Cook @ 2017-10-18 15:40 UTC (permalink / raw)
  To: Mark Brown
  Cc: Felipe Balbi, Greg Kroah-Hartman, Allen Pais, linux-usb,
	Linux-Next Mailing List, Linux Kernel Mailing List

On Wed, Oct 18, 2017 at 7:42 AM, Mark Brown <broonie@kernel.org> wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in:
>
>   drivers/usb/gadget/udc/snps_udc_core.c
>
> between commit:
>
>   29bce57723351f63d ("usb/gadget/snps_udc_core: Convert timers to use timer_setup()")
>
> from the usb tree and commit:
>
>   46b614affda8667f9 ("usb: gadget: udc: snps_udc_core: use setup_timer() helper.")
>
> from the usb-gadget tree.
>
> I fixed it up by taking the USB version 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.

FWIW, timer_setup() should be preferred over setup_timer().

-Kees

-- 
Kees Cook
Pixel Security

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

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
       [not found] ` <20171018144912.qlc7vlnhdqmr5tdd-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org>
@ 2017-10-18 15:40   ` Kees Cook
  2017-10-18 16:04     ` Mark Brown
  0 siblings, 1 reply; 23+ messages in thread
From: Kees Cook @ 2017-10-18 15:40 UTC (permalink / raw)
  To: Mark Brown
  Cc: Felipe Balbi, Tony Lindgren, Felipe Balbi, Greg Kroah-Hartman,
	Allen Pais, linux-omap-u79uwXL29TY76Z2rM5mHXA,
	linux-usb-u79uwXL29TY76Z2rM5mHXA, Linux-Next Mailing List,
	Linux Kernel Mailing List

On Wed, Oct 18, 2017 at 7:49 AM, Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in:
>
>   drivers/usb/phy/phy-isp1301-omap.c
>
> between commit:
>
>   4c13fec1ba55595 ("usb: isp1301-omap: Convert timers to use timer_setup()")
>
> from the usb tree and commit:
>
>   687f272c6b0e89d ("usb: phy: omap: use setup_timer() helper.")
>
> from the usb-gadget tree.
>
> I fixed it up with the USB version 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.

FWIW, timer_setup() should be preferred over setup_timer().

-Kees

-- 
Kees Cook
Pixel Security
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2017-10-18 14:49 Mark Brown
       [not found] ` <20171018144912.qlc7vlnhdqmr5tdd-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org>
  0 siblings, 1 reply; 23+ messages in thread
From: Mark Brown @ 2017-10-18 14:49 UTC (permalink / raw)
  To: Felipe Balbi, Kees Cook, Tony Lindgren, Felipe Balbi,
	Greg Kroah-Hartman, Allen Pais
  Cc: linux-omap, linux-usb, Linux-Next Mailing List,
	Linux Kernel Mailing List


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

Hi Felipe,

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

  drivers/usb/phy/phy-isp1301-omap.c

between commit:

  4c13fec1ba55595 ("usb: isp1301-omap: Convert timers to use timer_setup()")

from the usb tree and commit:

  687f272c6b0e89d ("usb: phy: omap: use setup_timer() helper.")

from the usb-gadget tree.

I fixed it up with the USB version 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.

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

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

* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2017-10-18 14:42 Mark Brown
  2017-10-18 15:40 ` Kees Cook
  0 siblings, 1 reply; 23+ messages in thread
From: Mark Brown @ 2017-10-18 14:42 UTC (permalink / raw)
  To: Felipe Balbi, Kees Cook, Greg Kroah-Hartman, Allen Pais
  Cc: linux-usb, Linux-Next Mailing List, Linux Kernel Mailing List


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

Hi Felipe,

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

  drivers/usb/gadget/udc/snps_udc_core.c

between commit:

  29bce57723351f63d ("usb/gadget/snps_udc_core: Convert timers to use timer_setup()")

from the usb tree and commit:

  46b614affda8667f9 ("usb: gadget: udc: snps_udc_core: use setup_timer() helper.")

from the usb-gadget tree.

I fixed it up by taking the USB version 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.

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

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

* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2017-04-07  4:45 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2017-04-07  4:45 UTC (permalink / raw)
  To: Felipe Balbi, Greg KH
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Romain Perier, Gustavo A. R. Silva

Hi Felipe,

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

  drivers/usb/gadget/udc/amd5536udc.c

between commit:

  b5a6a4e5baef ("usb: gadget: amd5536udc: Replace PCI pool old API")

from the usb tree and commit:

  7bf80fcd797f ("usb: gadget: udc: avoid use of freed pointer")

from the usb-gadget 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/gadget/udc/amd5536udc.c
index 270876b438ab,91d0f1a4dac1..000000000000
--- a/drivers/usb/gadget/udc/amd5536udc.c
+++ b/drivers/usb/gadget/udc/amd5536udc.c
@@@ -618,17 -579,12 +579,12 @@@ static void udc_free_dma_chain(struct u
  	DBG(dev, "free chain req = %p\n", req);
  
  	/* do not free first desc., will be done by free for request */
- 	td_last = req->td_data;
- 	td = phys_to_virt(td_last->next);
- 
  	for (i = 1; i < req->chain_len; i++) {
- 		dma_pool_free(dev->data_requests, td,
- 			      (dma_addr_t)td_last->next);
- 		td_last = td;
- 		td = phys_to_virt(td_last->next);
+ 		td = phys_to_virt(addr);
+ 		addr_next = (dma_addr_t)td->next;
 -		pci_pool_free(dev->data_requests, td, addr);
++		dma_pool_free(dev->data_requests, td, addr);
+ 		addr = addr_next;
  	}
- 
- 	return ret_val;
  }
  
  /* Frees request packet, called by gadget driver */

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

* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2017-04-07  4:41 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2017-04-07  4:41 UTC (permalink / raw)
  To: Felipe Balbi, Greg KH
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, yuan linyu,
	Raviteja Garimella

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got conflicts in:

  drivers/usb/gadget/udc/Kconfig

between commit:

  2c93e790e825 ("usb: add CONFIG_USB_PCI for system have both PCI HW and non-PCI based USB HW")

from the usb tree and commit:

  5dbc49aebd0a ("usb: gadget: udc: amd5536: split core and PCI layer")

from the usb-gadget 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/gadget/udc/Kconfig
index c6cc9d3270ac,707814da6000..000000000000
--- a/drivers/usb/gadget/udc/Kconfig
+++ b/drivers/usb/gadget/udc/Kconfig
@@@ -277,7 -292,8 +292,8 @@@ source "drivers/usb/gadget/udc/bdc/Kcon
  
  config USB_AMD5536UDC
  	tristate "AMD5536 UDC"
 -	depends on PCI
 +	depends on USB_PCI
+ 	select USB_SNP_CORE
  	help
  	   The AMD5536 UDC is part of the AMD Geode CS5536, an x86 southbridge.
  	   It is a USB Highspeed DMA capable USB device controller. Beside ep0

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

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2014-11-06  3:58 Stephen Rothwell
@ 2014-11-06  4:59 ` Felipe Balbi
  0 siblings, 0 replies; 23+ messages in thread
From: Felipe Balbi @ 2014-11-06  4:59 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Felipe Balbi, Greg KH, linux-next, linux-kernel, Peter Chen


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

On Thu, Nov 06, 2014 at 02:58:32PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/chipidea/otg_fsm.c between commit 51f1741fcc16 ("usb:
> chipidea: otg_fsm: delete unnecessary 'out of memory' messages") from
> the usb tree and commit ef44cb4226d1 ("usb: allow to supply the PHY in
> the drivers when using HCD") from the usb-gadget tree.
> 
> I fixed it up (the latter removed the code modified by the former) and
> can carry the fix as necessary (no action is required).

Alright, thanks for fixing it up.

-- 
balbi

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

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

* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2014-11-06  3:58 Stephen Rothwell
  2014-11-06  4:59 ` Felipe Balbi
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2014-11-06  3:58 UTC (permalink / raw)
  To: Felipe Balbi, Greg KH; +Cc: linux-next, linux-kernel, Peter Chen


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

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/chipidea/otg_fsm.c between commit 51f1741fcc16 ("usb:
chipidea: otg_fsm: delete unnecessary 'out of memory' messages") from
the usb tree and commit ef44cb4226d1 ("usb: allow to supply the PHY in
the drivers when using HCD") from the usb-gadget tree.

I fixed it up (the latter removed the code modified by the former) 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] 23+ messages in thread

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2014-04-28  5:20 Stephen Rothwell
@ 2014-04-28 16:11 ` Felipe Balbi
  0 siblings, 0 replies; 23+ messages in thread
From: Felipe Balbi @ 2014-04-28 16:11 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Felipe Balbi, Greg KH, linux-next, linux-kernel, Paul Bolle


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

On Mon, Apr 28, 2014 at 03:20:44PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/phy/phy-mv-u3d-usb.c between commit 543cab640279 ("usb: phy:
> mv_u3d: Remove usb phy driver for mv_u3d") from the usb tree and commit
> 041832565e40 ("usb: phy: mv-u3d: switch over to writel/readl") from the
> usb-gadget tree.
> 
> I fixed it up (the former removes the file, so I did that) and can carry
> the fix as necessary (no action is required).

I actually rejected that patch as you can see from the archives:

http://marc.info/?l=linux-usb&m=139758276329167&w=2

I said that it doesn't break anything and can even build in any
architecture if we switch over to writel/readl instead of _relaxed
versions which are only available on ARM (afaict).

Greg, looks like this commit went in your tree by mistake.

cheers

-- 
balbi

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

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

* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2014-04-28  5:20 Stephen Rothwell
  2014-04-28 16:11 ` Felipe Balbi
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2014-04-28  5:20 UTC (permalink / raw)
  To: Felipe Balbi, Greg KH; +Cc: linux-next, linux-kernel, Paul Bolle


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

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-mv-u3d-usb.c between commit 543cab640279 ("usb: phy:
mv_u3d: Remove usb phy driver for mv_u3d") from the usb tree and commit
041832565e40 ("usb: phy: mv-u3d: switch over to writel/readl") from the
usb-gadget tree.

I fixed it up (the former removes the file, 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] 23+ messages in thread

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2013-08-02  6:38 Stephen Rothwell
@ 2013-08-02  7:23 ` Felipe Balbi
  0 siblings, 0 replies; 23+ messages in thread
From: Felipe Balbi @ 2013-08-02  7:23 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Felipe Balbi, linux-next, linux-kernel, Jingoo Han, Greg KH,
	Tuomas Tynkkynen


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

Hi,

On Fri, Aug 02, 2013 at 04:38:18PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit d4f09e28d7bc ("USB: host:
> use dev_get_platdata()") from the usb tree and commit d50642794508 ("usb:
> tegra: host: Remove references to plat data") from the usb-gadget tree.
> 
> I fixed it up (the latter just removed the code updated by the former, so
> I did that) 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] 23+ messages in thread

* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2013-08-02  6:38 Stephen Rothwell
  2013-08-02  7:23 ` Felipe Balbi
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2013-08-02  6:38 UTC (permalink / raw)
  To: Felipe Balbi
  Cc: linux-next, linux-kernel, Jingoo Han, Greg KH, Tuomas Tynkkynen


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

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/host/ehci-tegra.c between commit d4f09e28d7bc ("USB: host:
use dev_get_platdata()") from the usb tree and commit d50642794508 ("usb:
tegra: host: Remove references to plat data") from the usb-gadget tree.

I fixed it up (the latter just removed the code updated 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] 23+ messages in thread

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2013-04-04  6:27 ` Thierry Reding
@ 2013-04-04  7:08   ` Felipe Balbi
  0 siblings, 0 replies; 23+ messages in thread
From: Felipe Balbi @ 2013-04-04  7:08 UTC (permalink / raw)
  To: Thierry Reding
  Cc: Stephen Rothwell, Felipe Balbi, linux-next, linux-kernel,
	Thierry Reding, Greg KH


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

On Thu, Apr 04, 2013 at 08:27:30AM +0200, Thierry Reding wrote:
> On Thu, Apr 04, 2013 at 03:18:45PM +1100, Stephen Rothwell wrote:
> > Hi Felipe,
> > 
> > Today's linux-next merge of the usb-gadget tree got a conflict in
> > drivers/usb/host/ehci-tegra.c between commit 369a9a9d2af7 ("usb: host:
> > ehci-tegra: Fix oops in error cleanup") from the usb tree and commit
> > 4261b8f3538c ("usb: host: ehci-tegra: fix PHY error handling") from the
> > usb-gadget tree.
> > 
> > I fixed it up (I think - 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-tegra.c
> > index 4f3cfb8,1d2488c..0000000
> > --- a/drivers/usb/host/ehci-tegra.c
> > +++ b/drivers/usb/host/ehci-tegra.c
> > @@@ -770,19 -765,15 +770,17 @@@ static int tegra_ehci_probe(struct plat
> >   	if (!irq) {
> >   		dev_err(&pdev->dev, "Failed to get IRQ\n");
> >   		err = -ENODEV;
> >  -		goto fail;
> >  +		goto fail_phy;
> >   	}
> >   
> >   	if (pdata->operating_mode == TEGRA_USB_OTG) {
> >   		tegra->transceiver =
> >   			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
> > - 		if (!IS_ERR_OR_NULL(tegra->transceiver))
> > + 		if (!IS_ERR(tegra->transceiver))
> >   			otg_set_host(tegra->transceiver->otg, &hcd->self);
> >  +	} else {
> >  +		tegra->transceiver = ERR_PTR(-ENODEV);
> >   	}
> > - #endif
> >   
> >   	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
> >   	if (err) {
> > @@@ -801,11 -792,8 +799,9 @@@
> >   	return err;
> >   
> >   fail:
> > - #ifdef CONFIG_USB_OTG_UTILS
> > - 	if (!IS_ERR_OR_NULL(tegra->transceiver))
> > + 	if (!IS_ERR(tegra->transceiver))
> >   		otg_set_host(tegra->transceiver->otg, NULL);
> > - #endif
> >  +fail_phy:
> >   	usb_phy_shutdown(hcd->phy);
> >   fail_io:
> >   	clk_disable_unprepare(tegra->clk);
> 
> Looks good to me, thanks.

looks correct indeed, thanks

-- 
balbi

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

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

* Re: linux-next: manual merge of the usb-gadget tree with the usb tree
  2013-04-04  4:18 Stephen Rothwell
@ 2013-04-04  6:27 ` Thierry Reding
  2013-04-04  7:08   ` Felipe Balbi
  0 siblings, 1 reply; 23+ messages in thread
From: Thierry Reding @ 2013-04-04  6:27 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Felipe Balbi, linux-next, linux-kernel, Thierry Reding, Greg KH


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

On Thu, Apr 04, 2013 at 03:18:45PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit 369a9a9d2af7 ("usb: host:
> ehci-tegra: Fix oops in error cleanup") from the usb tree and commit
> 4261b8f3538c ("usb: host: ehci-tegra: fix PHY error handling") from the
> usb-gadget tree.
> 
> I fixed it up (I think - 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-tegra.c
> index 4f3cfb8,1d2488c..0000000
> --- a/drivers/usb/host/ehci-tegra.c
> +++ b/drivers/usb/host/ehci-tegra.c
> @@@ -770,19 -765,15 +770,17 @@@ static int tegra_ehci_probe(struct plat
>   	if (!irq) {
>   		dev_err(&pdev->dev, "Failed to get IRQ\n");
>   		err = -ENODEV;
>  -		goto fail;
>  +		goto fail_phy;
>   	}
>   
>   	if (pdata->operating_mode == TEGRA_USB_OTG) {
>   		tegra->transceiver =
>   			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
> - 		if (!IS_ERR_OR_NULL(tegra->transceiver))
> + 		if (!IS_ERR(tegra->transceiver))
>   			otg_set_host(tegra->transceiver->otg, &hcd->self);
>  +	} else {
>  +		tegra->transceiver = ERR_PTR(-ENODEV);
>   	}
> - #endif
>   
>   	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
>   	if (err) {
> @@@ -801,11 -792,8 +799,9 @@@
>   	return err;
>   
>   fail:
> - #ifdef CONFIG_USB_OTG_UTILS
> - 	if (!IS_ERR_OR_NULL(tegra->transceiver))
> + 	if (!IS_ERR(tegra->transceiver))
>   		otg_set_host(tegra->transceiver->otg, NULL);
> - #endif
>  +fail_phy:
>   	usb_phy_shutdown(hcd->phy);
>   fail_io:
>   	clk_disable_unprepare(tegra->clk);

Looks good to me, thanks.

Thierry

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

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

* linux-next: manual merge of the usb-gadget tree with the usb tree
@ 2013-04-04  4:18 Stephen Rothwell
  2013-04-04  6:27 ` Thierry Reding
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2013-04-04  4:18 UTC (permalink / raw)
  To: Felipe Balbi; +Cc: linux-next, linux-kernel, Thierry Reding, Greg KH


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

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/host/ehci-tegra.c between commit 369a9a9d2af7 ("usb: host:
ehci-tegra: Fix oops in error cleanup") from the usb tree and commit
4261b8f3538c ("usb: host: ehci-tegra: fix PHY error handling") from the
usb-gadget tree.

I fixed it up (I think - 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-tegra.c
index 4f3cfb8,1d2488c..0000000
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -770,19 -765,15 +770,17 @@@ static int tegra_ehci_probe(struct plat
  	if (!irq) {
  		dev_err(&pdev->dev, "Failed to get IRQ\n");
  		err = -ENODEV;
 -		goto fail;
 +		goto fail_phy;
  	}
  
  	if (pdata->operating_mode == TEGRA_USB_OTG) {
  		tegra->transceiver =
  			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
- 		if (!IS_ERR_OR_NULL(tegra->transceiver))
+ 		if (!IS_ERR(tegra->transceiver))
  			otg_set_host(tegra->transceiver->otg, &hcd->self);
 +	} else {
 +		tegra->transceiver = ERR_PTR(-ENODEV);
  	}
- #endif
  
  	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
  	if (err) {
@@@ -801,11 -792,8 +799,9 @@@
  	return err;
  
  fail:
- #ifdef CONFIG_USB_OTG_UTILS
- 	if (!IS_ERR_OR_NULL(tegra->transceiver))
+ 	if (!IS_ERR(tegra->transceiver))
  		otg_set_host(tegra->transceiver->otg, NULL);
- #endif
 +fail_phy:
  	usb_phy_shutdown(hcd->phy);
  fail_io:
  	clk_disable_unprepare(tegra->clk);

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

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

end of thread, back to index

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-21  7:21 linux-next: manual merge of the usb-gadget tree with the usb tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-03-16  3:23 Stephen Rothwell
2020-03-16  7:25 ` Greg KH
2020-03-16  8:18 ` Greg KH
2018-05-17  4:03 Stephen Rothwell
2018-05-17  7:07 ` Greg KH
2017-10-18 14:49 Mark Brown
     [not found] ` <20171018144912.qlc7vlnhdqmr5tdd-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org>
2017-10-18 15:40   ` Kees Cook
2017-10-18 16:04     ` Mark Brown
2017-10-18 14:42 Mark Brown
2017-10-18 15:40 ` Kees Cook
2017-10-19  7:37   ` Felipe Balbi
2017-04-07  4:45 Stephen Rothwell
2017-04-07  4:41 Stephen Rothwell
2014-11-06  3:58 Stephen Rothwell
2014-11-06  4:59 ` Felipe Balbi
2014-04-28  5:20 Stephen Rothwell
2014-04-28 16:11 ` Felipe Balbi
2013-08-02  6:38 Stephen Rothwell
2013-08-02  7:23 ` Felipe Balbi
2013-04-04  4:18 Stephen Rothwell
2013-04-04  6:27 ` Thierry Reding
2013-04-04  7:08   ` Felipe Balbi

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