linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* 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; 81+ 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] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2024-02-20  3:39 Stephen Rothwell
  2024-02-20  8:18 ` Greg KH
  2024-02-26  5:55 ` Greg KH
  0 siblings, 2 replies; 81+ messages in thread
From: Stephen Rothwell @ 2024-02-20  3:39 UTC (permalink / raw)
  To: Greg KH
  Cc: Greg Kroah-Hartman, Heikki Krogerus, Linux Kernel Mailing List,
	Linux Next Mailing List, Xu Yang

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

Hi all,

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

  drivers/usb/roles/class.c

between commit:

  b787a3e78175 ("usb: roles: don't get/set_role() when usb_role_switch is unregistered")

from the usb.current tree and commit:

  9a270ec7bfb0 ("usb: roles: Link the switch to its connector")

from the usb tree.

I fixed it up (I think - 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/roles/class.c
index 70165dd86b5d,4ad03c93c17f..000000000000
--- a/drivers/usb/roles/class.c
+++ b/drivers/usb/roles/class.c
@@@ -361,8 -379,12 +388,14 @@@ usb_role_switch_register(struct device 
  		return ERR_PTR(ret);
  	}
  
+ 	if (dev_fwnode(&sw->dev)) {
+ 		ret = component_add(&sw->dev, &connector_ops);
+ 		if (ret)
+ 			dev_warn(&sw->dev, "failed to add component\n");
+ 	}
+ 
 +	sw->registered = true;
 +
  	/* TODO: Symlinks for the host port and the device controller. */
  
  	return sw;
@@@ -377,10 -399,11 +410,12 @@@ EXPORT_SYMBOL_GPL(usb_role_switch_regis
   */
  void usb_role_switch_unregister(struct usb_role_switch *sw)
  {
- 	if (!IS_ERR_OR_NULL(sw)) {
- 		sw->registered = false;
- 		device_unregister(&sw->dev);
- 	}
+ 	if (IS_ERR_OR_NULL(sw))
+ 		return;
++	sw->registered = false;
+ 	if (dev_fwnode(&sw->dev))
+ 		component_del(&sw->dev, &connector_ops);
+ 	device_unregister(&sw->dev);
  }
  EXPORT_SYMBOL_GPL(usb_role_switch_unregister);
  

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

^ permalink raw reply	[flat|nested] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2023-05-15  2:50 Stephen Rothwell
  2023-05-28 14:28 ` Greg KH
  0 siblings, 1 reply; 81+ messages in thread
From: Stephen Rothwell @ 2023-05-15  2:50 UTC (permalink / raw)
  To: Greg KH
  Cc: Francesco Dolcini, Greg Kroah-Hartman, Krishna Kurapati,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

  drivers/usb/gadget/udc/core.c

between commit:

  f22e9b67f19c ("Revert "usb: gadget: udc: core: Invoke usb_gadget_connect only when started"")

from the usb.current tree and commit:

  d34f9bafa78d ("usb: gadget: udc: Handle gadget_connect failure during bind operation")

from the usb tree.

I fixed it up (I think - 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/core.c
index 52e6d2e84e35,69041cca5d24..000000000000
--- a/drivers/usb/gadget/udc/core.c
+++ b/drivers/usb/gadget/udc/core.c
@@@ -1078,12 -1121,17 +1078,16 @@@ EXPORT_SYMBOL_GPL(usb_gadget_set_state)
  
  /* ------------------------------------------------------------------------- */
  
- static void usb_udc_connect_control(struct usb_udc *udc)
 -/* Acquire connect_lock before calling this function. */
 -static int usb_udc_connect_control_locked(struct usb_udc *udc) __must_hold(&udc->connect_lock)
++static int usb_udc_connect_control(struct usb_udc *udc)
  {
+ 	int ret;
+ 
 -	if (udc->vbus && udc->started)
 -		ret = usb_gadget_connect_locked(udc->gadget);
 +	if (udc->vbus)
- 		usb_gadget_connect(udc->gadget);
++		ret = usb_gadget_connect(udc->gadget);
  	else
- 		usb_gadget_disconnect(udc->gadget);
 -		ret = usb_gadget_disconnect_locked(udc->gadget);
++		ret = usb_gadget_disconnect(udc->gadget);
+ 
+ 	return ret;
  }
  
  /**
@@@ -1523,15 -1580,28 +1527,23 @@@ static int gadget_bind_driver(struct de
  	if (ret)
  		goto err_bind;
  
 -	mutex_lock(&udc->connect_lock);
 -	ret = usb_gadget_udc_start_locked(udc);
 -	if (ret) {
 -		mutex_unlock(&udc->connect_lock);
 +	ret = usb_gadget_udc_start(udc);
 +	if (ret)
  		goto err_start;
 -	}
  	usb_gadget_enable_async_callbacks(udc);
- 	usb_udc_connect_control(udc);
 -	ret = usb_udc_connect_control_locked(udc);
++	ret = usb_udc_connect_control(udc);
+ 	if (ret)
+ 		goto err_connect_control;
  
 -	mutex_unlock(&udc->connect_lock);
 -
  	kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
  	return 0;
  
+  err_connect_control:
+ 	usb_gadget_disable_async_callbacks(udc);
+ 	if (gadget->irq)
+ 		synchronize_irq(gadget->irq);
 -	usb_gadget_udc_stop_locked(udc);
++	usb_gadget_udc_stop(udc);
+ 
   err_start:
  	driver->unbind(udc->gadget);
  

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

^ permalink raw reply	[flat|nested] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2023-05-15  2:35 Stephen Rothwell
  2023-05-15  3:50 ` Greg KH
                   ` (2 more replies)
  0 siblings, 3 replies; 81+ messages in thread
From: Stephen Rothwell @ 2023-05-15  2:35 UTC (permalink / raw)
  To: Greg KH
  Cc: Greg Kroah-Hartman, Krishna Kurapati, Linux Kernel Mailing List,
	Linux Next Mailing List, Roger Quadros

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

Hi all,

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

  drivers/usb/dwc3/gadget.c

between commit:

  c8540870af4c ("usb: dwc3: gadget: Improve dwc3_gadget_suspend() and dwc3_gadget_resume()")

from the usb.current tree and commit:

  813f44d57e19 ("usb: dwc3: gadget: Bail out in pullup if soft reset timeout happens")

from the usb tree.

I fixed it up (I think - 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/gadget.c
index d831f5acf7b5,5965796bc5d5..000000000000
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -2700,21 -2699,6 +2700,26 @@@ static int dwc3_gadget_soft_disconnect(
  	return ret;
  }
  
 +static int dwc3_gadget_soft_connect(struct dwc3 *dwc)
 +{
++	int	ret;
++
 +	/*
 +	 * In the Synopsys DWC_usb31 1.90a programming guide section
 +	 * 4.1.9, it specifies that for a reconnect after a
 +	 * device-initiated disconnect requires a core soft reset
 +	 * (DCTL.CSftRst) before enabling the run/stop bit.
 +	 */
 +	dwc3_core_soft_reset(dwc);
++	ret = dwc3_core_soft_reset(dwc);
++	if (ret)
++		return ret;
 +
 +	dwc3_event_buffers_setup(dwc);
 +	__dwc3_gadget_start(dwc);
 +	return dwc3_gadget_run_stop(dwc, true);
 +}
 +
  static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
  {
  	struct dwc3		*dwc = gadget_to_dwc(g);

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

^ permalink raw reply	[flat|nested] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2023-03-31  3:01 Stephen Rothwell
  2023-03-31  7:52 ` Greg KH
  2023-04-10  6:56 ` Greg KH
  0 siblings, 2 replies; 81+ messages in thread
From: Stephen Rothwell @ 2023-03-31  3:01 UTC (permalink / raw)
  To: Greg KH
  Cc: Arnd Bergmann, Greg Kroah-Hartman, Linux Kernel Mailing List,
	Linux Next Mailing List, Mathias Nyman

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

Hi all,

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

  drivers/usb/host/xhci-pci.c

between commit:

  8e77d3d59d7b ("Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS"")

from the usb.current tree and commit:

  130eac417085 ("xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals")

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/host/xhci-pci.c
index 6db07ca419c3,bbbb01282038..000000000000
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@@ -771,11 -967,10 +967,9 @@@ static struct pci_driver xhci_pci_drive
  	/* suspend and resume implemented later */
  
  	.shutdown = 	usb_hcd_pci_shutdown,
- #ifdef CONFIG_PM
  	.driver = {
- 		.pm = &usb_hcd_pci_pm_ops
+ 		.pm = pm_ptr(&usb_hcd_pci_pm_ops),
 -		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
  	},
- #endif
  };
  
  static int __init xhci_pci_init(void)

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

^ permalink raw reply	[flat|nested] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2023-01-19  3:48 Stephen Rothwell
  0 siblings, 0 replies; 81+ messages in thread
From: Stephen Rothwell @ 2023-01-19  3:48 UTC (permalink / raw)
  To: Greg KH
  Cc: Greg Kroah-Hartman, Jim Lin, Linux Kernel Mailing List,
	Linux Next Mailing List, Mathias Nyman

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

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  drivers/usb/host/xhci.c
  drivers/usb/host/xhci.h

between commit:

  23a3b8d5a236 ("xhci: Add update_hub_device override for PCI xHCI hosts")

from the usb.current tree and commit:

  592338dde854 ("xhci: Add hub_control to xhci_driver_overrides")

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/host/xhci.c
index 2b280beb0011,748c7158198f..000000000000
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@@ -5516,8 -5502,8 +5516,10 @@@ void xhci_init_driver(struct hc_driver 
  			drv->check_bandwidth = over->check_bandwidth;
  		if (over->reset_bandwidth)
  			drv->reset_bandwidth = over->reset_bandwidth;
 +		if (over->update_hub_device)
 +			drv->update_hub_device = over->update_hub_device;
+ 		if (over->hub_control)
+ 			drv->hub_control = over->hub_control;
  	}
  }
  EXPORT_SYMBOL_GPL(xhci_init_driver);
diff --cc drivers/usb/host/xhci.h
index dcee7f3207ad,f71841812f06..000000000000
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -1944,8 -1943,8 +1944,10 @@@ struct xhci_driver_overrides 
  			     struct usb_host_endpoint *ep);
  	int (*check_bandwidth)(struct usb_hcd *, struct usb_device *);
  	void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
 +	int (*update_hub_device)(struct usb_hcd *hcd, struct usb_device *hdev,
 +			    struct usb_tt *tt, gfp_t mem_flags);
+ 	int (*hub_control)(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+ 			   u16 wIndex, char *buf, u16 wLength);
  };
  
  #define	XHCI_CFC_DELAY		10

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

^ permalink raw reply	[flat|nested] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2023-01-18  0:56 Stephen Rothwell
  2023-01-18  7:48 ` Greg KH
  2023-01-23 14:40 ` Greg KH
  0 siblings, 2 replies; 81+ messages in thread
From: Stephen Rothwell @ 2023-01-18  0:56 UTC (permalink / raw)
  To: Greg KH
  Cc: Greg Kroah-Hartman, Jack Pham, Linux Kernel Mailing List,
	Linux Next Mailing List, Linyu Yuan, Rajaram Regupathy,
	Saranya Gopal

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

Hi all,

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

  drivers/usb/typec/ucsi/ucsi.c

between commit:

  fac4b8633fd6 ("usb: ucsi: Ensure connector delayed work items are flushed")

from the usb.current tree and commit:

  b04e1747fbcc ("usb: typec: ucsi: Register USB Power Delivery Capabilities")

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/typec/ucsi/ucsi.c
index 1292241d581a,d04809476f71..000000000000
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@@ -1426,20 -1551,14 +1557,26 @@@ void ucsi_unregister(struct ucsi *ucsi
  		ucsi_unregister_altmodes(&ucsi->connector[i],
  					 UCSI_RECIPIENT_CON);
  		ucsi_unregister_port_psy(&ucsi->connector[i]);
 -		if (ucsi->connector[i].wq)
 +
 +		if (ucsi->connector[i].wq) {
 +			struct ucsi_work *uwork;
 +
 +			mutex_lock(&ucsi->connector[i].lock);
 +			/*
 +			 * queue delayed items immediately so they can execute
 +			 * and free themselves before the wq is destroyed
 +			 */
 +			list_for_each_entry(uwork, &ucsi->connector[i].partner_tasks, node)
 +				mod_delayed_work(ucsi->connector[i].wq, &uwork->work, 0);
 +			mutex_unlock(&ucsi->connector[i].lock);
  			destroy_workqueue(ucsi->connector[i].wq);
 +		}
+ 		usb_power_delivery_unregister_capabilities(ucsi->connector[i].port_sink_caps);
+ 		ucsi->connector[i].port_sink_caps = NULL;
+ 		usb_power_delivery_unregister_capabilities(ucsi->connector[i].port_source_caps);
+ 		ucsi->connector[i].port_source_caps = NULL;
+ 		usb_power_delivery_unregister(ucsi->connector[i].pd);
+ 		ucsi->connector[i].pd = NULL;
  		typec_unregister_port(ucsi->connector[i].port);
  	}
  

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

^ permalink raw reply	[flat|nested] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2022-09-01  3:52 Stephen Rothwell
  2022-09-05  6:04 ` Greg KH
  0 siblings, 1 reply; 81+ messages in thread
From: Stephen Rothwell @ 2022-09-01  3:52 UTC (permalink / raw)
  To: Greg KH
  Cc: Greg Kroah-Hartman, Linux Kernel Mailing List,
	Linux Next Mailing List, Wesley Cheng

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

Hi all,

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

  drivers/usb/dwc3/gadget.c

between commit:

  040f2dbd2010 ("usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop")

from the usb.current tree and commit:

  9711c67de748 ("usb: dwc3: gadget: Synchronize IRQ between soft connect/disconnect")

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/dwc3/gadget.c
index eca945feeec3,d6c0cb79ace3..000000000000
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -2563,11 -2569,8 +2566,13 @@@ static int dwc3_gadget_pullup(struct us
  		return 0;
  	}
  
 +	if (dwc->pullups_connected == is_on) {
 +		pm_runtime_put(dwc->dev);
 +		return 0;
 +	}
 +
+ 	synchronize_irq(dwc->irq_gadget);
+ 
  	if (!is_on) {
  		ret = dwc3_gadget_soft_disconnect(dwc);
  	} else {

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

^ permalink raw reply	[flat|nested] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2022-04-26  5:08 Stephen Rothwell
  2022-04-26  9:41 ` Greg KH
  2022-05-03 14:36 ` Greg KH
  0 siblings, 2 replies; 81+ messages in thread
From: Stephen Rothwell @ 2022-04-26  5:08 UTC (permalink / raw)
  To: Greg KH
  Cc: Andrey Smirnov, Greg Kroah-Hartman, Linux Kernel Mailing List,
	Linux Next Mailing List, Sven Peter

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

Hi all,

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

  drivers/usb/dwc3/drd.c

between commit:

  ab7aa2866d29 ("usb: dwc3: Try usb-role-switch first in dwc3_drd_init")

from the usb.current tree and commit:

  0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral if extcon is present")

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/dwc3/drd.c
index 8cad9e7d3368,f277bebdaa09..000000000000
--- a/drivers/usb/dwc3/drd.c
+++ b/drivers/usb/dwc3/drd.c
@@@ -585,14 -539,11 +539,10 @@@ int dwc3_drd_init(struct dwc3 *dwc
  	int ret, irq;
  
  	if (ROLE_SWITCH &&
 -	    device_property_read_bool(dwc->dev, "usb-role-switch")) {
 -		ret = dwc3_setup_role_switch(dwc);
 -		if (ret < 0)
 -			return ret;
 -	} else if (dwc->edev) {
 +	    device_property_read_bool(dwc->dev, "usb-role-switch"))
 +		return dwc3_setup_role_switch(dwc);
 +
- 	dwc->edev = dwc3_get_extcon(dwc);
- 	if (IS_ERR(dwc->edev))
- 		return PTR_ERR(dwc->edev);
- 
 +	if (dwc->edev) {
  		dwc->edev_nb.notifier_call = dwc3_drd_notifier;
  		ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST,
  					       &dwc->edev_nb);

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

^ permalink raw reply	[flat|nested] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2022-02-21 20:39 broonie
  2022-02-22  7:44 ` Greg KH
  0 siblings, 1 reply; 81+ messages in thread
From: broonie @ 2022-02-21 20:39 UTC (permalink / raw)
  To: Greg KH
  Cc: Greg Kroah-Hartman, Hans de Goede, Linux Kernel Mailing List,
	Linux Next Mailing List

Hi all,

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

  drivers/usb/dwc3/dwc3-pci.c

between commit:

  d7c93a903f33f ("usb: dwc3: pci: Add "snps,dis_u2_susphy_quirk" for Intel Bay Trail")

from the usb.current tree and commit:

  582ab24e096fd ("usb: dwc3: pci: Set "linux,phy_charger_detect" property on some Bay Trail boards")

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.

diff --cc arch/arm64/boot/dts/qcom/ipq6018.dtsi
index 4e7efa97724bd,a614b9f73e2cd..0000000000000
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
diff --cc drivers/usb/dwc3/dwc3-pci.c
index 06d0e88ec8af9,4330c974b31ba..0000000000000
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@@ -120,13 -119,14 +120,21 @@@ static const struct property_entry dwc3
  	{}
  };
  
 +static const struct property_entry dwc3_pci_intel_byt_properties[] = {
 +	PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),
 +	PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),
 +	PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
 +	{}
 +};
 +
+ static const struct property_entry dwc3_pci_intel_phy_charger_detect_properties[] = {
+ 	PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),
+ 	PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),
+ 	PROPERTY_ENTRY_BOOL("linux,phy_charger_detect"),
+ 	PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
+ 	{}
+ };
+ 
  static const struct property_entry dwc3_pci_mrfld_properties[] = {
  	PROPERTY_ENTRY_STRING("dr_mode", "otg"),
  	PROPERTY_ENTRY_STRING("linux,extcon-name", "mrfld_bcove_pwrsrc"),
@@@ -169,10 -169,10 +177,14 @@@ static const struct software_node dwc3_
  	.properties = dwc3_pci_intel_properties,
  };
  
 +static const struct software_node dwc3_pci_intel_byt_swnode = {
 +	.properties = dwc3_pci_intel_byt_properties,
 +};
 +
+ static const struct software_node dwc3_pci_intel_phy_charger_detect_swnode = {
+ 	.properties = dwc3_pci_intel_phy_charger_detect_properties,
+ };
+ 
  static const struct software_node dwc3_pci_intel_mrfld_swnode = {
  	.properties = dwc3_pci_mrfld_properties,
  };

^ permalink raw reply	[flat|nested] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2021-07-22  4:12 Stephen Rothwell
  2021-07-23 12:29 ` Greg KH
  2021-07-27 14:45 ` Greg KH
  0 siblings, 2 replies; 81+ messages in thread
From: Stephen Rothwell @ 2021-07-22  4:12 UTC (permalink / raw)
  To: Greg KH
  Cc: Greg Kroah-Hartman, Linux Kernel Mailing List,
	Linux Next Mailing List, Linyu Yuan, Wesley Cheng

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

Hi all,

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

  drivers/usb/dwc3/gadget.c

between commit:

  40edb52298df ("usb: dwc3: avoid NULL access of usb_gadget_driver")

from the usb.current tree and commit:

  9f607a309fbe ("usb: dwc3: Resize TX FIFOs to meet EP bursting requirements")

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/dwc3/gadget.c
index 45f2bc0807e8,e56f1a6db2de..000000000000
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -2585,16 -2771,51 +2771,61 @@@ static int dwc3_gadget_vbus_draw(struc
  	return ret;
  }
  
 +static void dwc3_gadget_async_callbacks(struct usb_gadget *g, bool enable)
 +{
 +	struct dwc3		*dwc = gadget_to_dwc(g);
 +	unsigned long		flags;
 +
 +	spin_lock_irqsave(&dwc->lock, flags);
 +	dwc->async_callbacks = enable;
 +	spin_unlock_irqrestore(&dwc->lock, flags);
 +}
 +
+ /**
+  * dwc3_gadget_check_config - ensure dwc3 can support the USB configuration
+  * @g: pointer to the USB gadget
+  *
+  * Used to record the maximum number of endpoints being used in a USB composite
+  * device. (across all configurations)  This is to be used in the calculation
+  * of the TXFIFO sizes when resizing internal memory for individual endpoints.
+  * It will help ensured that the resizing logic reserves enough space for at
+  * least one max packet.
+  */
+ static int dwc3_gadget_check_config(struct usb_gadget *g)
+ {
+ 	struct dwc3 *dwc = gadget_to_dwc(g);
+ 	struct usb_ep *ep;
+ 	int fifo_size = 0;
+ 	int ram1_depth;
+ 	int ep_num = 0;
+ 
+ 	if (!dwc->do_fifo_resize)
+ 		return 0;
+ 
+ 	list_for_each_entry(ep, &g->ep_list, ep_list) {
+ 		/* Only interested in the IN endpoints */
+ 		if (ep->claimed && (ep->address & USB_DIR_IN))
+ 			ep_num++;
+ 	}
+ 
+ 	if (ep_num <= dwc->max_cfg_eps)
+ 		return 0;
+ 
+ 	/* Update the max number of eps in the composition */
+ 	dwc->max_cfg_eps = ep_num;
+ 
+ 	fifo_size = dwc3_gadget_calc_tx_fifo_size(dwc, dwc->max_cfg_eps);
+ 	/* Based on the equation, increment by one for every ep */
+ 	fifo_size += dwc->max_cfg_eps;
+ 
+ 	/* Check if we can fit a single fifo per endpoint */
+ 	ram1_depth = DWC3_RAM1_DEPTH(dwc->hwparams.hwparams7);
+ 	if (fifo_size > ram1_depth)
+ 		return -ENOMEM;
+ 
+ 	return 0;
+ }
+ 
  static const struct usb_gadget_ops dwc3_gadget_ops = {
  	.get_frame		= dwc3_gadget_get_frame,
  	.wakeup			= dwc3_gadget_wakeup,
@@@ -2606,7 -2827,7 +2837,8 @@@
  	.udc_set_ssp_rate	= dwc3_gadget_set_ssp_rate,
  	.get_config_params	= dwc3_gadget_config_params,
  	.vbus_draw		= dwc3_gadget_vbus_draw,
 +	.udc_async_callbacks	= dwc3_gadget_async_callbacks,
+ 	.check_config		= dwc3_gadget_check_config,
  };
  
  /* -------------------------------------------------------------------------- */

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

^ permalink raw reply	[flat|nested] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2021-01-20  2:06 Stephen Rothwell
  2021-01-20  8:02 ` Greg KH
  0 siblings, 1 reply; 81+ messages in thread
From: Stephen Rothwell @ 2021-01-20  2:06 UTC (permalink / raw)
  To: Greg KH
  Cc: Al Cooper, Greg Kroah-Hartman, Linux Kernel Mailing List,
	Linux Next Mailing List, Patrik Jakobsson

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

Hi all,

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

  drivers/usb/gadget/udc/bdc/Kconfig

between commit:

  ef02684c4e67 ("usb: bdc: Make bdc pci driver depend on BROKEN")

from the usb.current tree and commit:

  7766cafea0ec ("usb: bdc: Remove the BDC PCI driver")

from the usb tree.

I fixed it up (the latter removed the text updated by the former) 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] 81+ messages in thread
* linux-next: manual merge of the usb tree with the usb.current tree
@ 2021-01-06  0:50 Stephen Rothwell
  2021-01-11  7:11 ` Greg KH
  0 siblings, 1 reply; 81+ messages in thread
From: Stephen Rothwell @ 2021-01-06  0:50 UTC (permalink / raw)
  To: Greg KH; +Cc: Linux Kernel Mailing List, Linux Next Mailing List, Wesley Cheng

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

Hi all,

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

  drivers/usb/dwc3/gadget.c

between commit:

  a1383b3537a7 ("usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup")

from the usb.current tree and commit:

  77adb8bdf422 ("usb: dwc3: gadget: Allow runtime suspend if UDC unbinded")

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/dwc3/gadget.c
index 25f654b79e48,85736dd6673b..000000000000
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -2146,8 -2212,7 +2213,9 @@@ static int dwc3_gadget_pullup(struct us
  			dwc->ev_buf->lpos = (dwc->ev_buf->lpos + count) %
  						dwc->ev_buf->length;
  		}
+ 		dwc->connected = false;
 +	} else {
 +		__dwc3_gadget_start(dwc);
  	}
  
  	ret = dwc3_gadget_run_stop(dwc, is_on, false);

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

^ permalink raw reply	[flat|nested] 81+ messages in thread
* 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; 81+ 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] 81+ 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; 81+ 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 related	[flat|nested] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ 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; 81+ 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] 81+ messages in thread

end of thread, other threads:[~2024-02-26  5:55 UTC | newest]

Thread overview: 81+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-05  4:18 linux-next: manual merge of the usb tree with the usb.current tree 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
  -- strict thread matches above, loose matches on Subject: below --
2024-02-20  3:39 Stephen Rothwell
2024-02-20  8:18 ` Greg KH
2024-02-26  5:55 ` Greg KH
2023-05-15  2:50 Stephen Rothwell
2023-05-28 14:28 ` Greg KH
2023-05-15  2:35 Stephen Rothwell
2023-05-15  3:50 ` Greg KH
2023-05-15  5:22 ` Krishna Kurapati PSSNV
2023-05-15 11:01 ` Roger Quadros
2023-05-15 11:36   ` Stephen Rothwell
2023-05-28 14:28   ` Greg KH
2023-05-28 15:48     ` Roger Quadros
2023-05-28 16:07       ` Greg KH
2023-03-31  3:01 Stephen Rothwell
2023-03-31  7:52 ` Greg KH
2023-04-10  6:56 ` Greg KH
2023-01-19  3:48 Stephen Rothwell
2023-01-18  0:56 Stephen Rothwell
2023-01-18  7:48 ` Greg KH
2023-01-23 14:40 ` Greg KH
2022-09-01  3:52 Stephen Rothwell
2022-09-05  6:04 ` Greg KH
2022-04-26  5:08 Stephen Rothwell
2022-04-26  9:41 ` Greg KH
2022-05-03 14:36 ` Greg KH
2022-02-21 20:39 broonie
2022-02-22  7:44 ` Greg KH
2021-07-22  4:12 Stephen Rothwell
2021-07-23 12:29 ` Greg KH
2021-07-27 14:45 ` Greg KH
2021-01-20  2:06 Stephen Rothwell
2021-01-20  8:02 ` Greg KH
2021-01-06  0:50 Stephen Rothwell
2021-01-11  7:11 ` Greg KH
2020-06-26  3:29 Stephen Rothwell
2020-06-26 15:14 ` Greg KH
2020-06-29  6:23 ` Greg KH
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
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).