linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the usb tree with the net-next tree
@ 2012-05-21  6:10 Stephen Rothwell
  2012-05-21  6:16 ` Kalle Valo
  2012-05-21 13:08 ` Greg KH
  0 siblings, 2 replies; 8+ messages in thread
From: Stephen Rothwell @ 2012-05-21  6:10 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Sarah Sharp, Kalle Valo, David Miller,
	netdev, John W. Linville

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/net/wireless/ath/ath6kl/usb.c between commit 9cbee358687e
("ath6kl: add full USB support") from the net-next tree and commit
e1f12eb6ba6f ("USB: Disable hub-initiated LPM for comms devices") 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/net/wireless/ath/ath6kl/usb.c
index dfbbe9e,f8a27db..0000000
--- a/drivers/net/wireless/ath/ath6kl/usb.c
+++ b/drivers/net/wireless/ath/ath6kl/usb.c
@@@ -1185,12 -403,9 +1185,13 @@@ MODULE_DEVICE_TABLE(usb, ath6kl_usb_ids
  static struct usb_driver ath6kl_usb_driver = {
  	.name = "ath6kl_usb",
  	.probe = ath6kl_usb_probe,
 +	.suspend = ath6kl_usb_suspend,
 +	.resume = ath6kl_usb_resume,
 +	.reset_resume = ath6kl_usb_reset_resume,
  	.disconnect = ath6kl_usb_remove,
  	.id_table = ath6kl_usb_ids,
 +	.supports_autosuspend = true,
+ 	.disable_hub_initiated_lpm = 1,
  };
  
  static int ath6kl_usb_init(void)

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

^ permalink raw reply	[flat|nested] 8+ messages in thread
* linux-next: manual merge of the usb tree with the net-next tree
@ 2013-08-13  6:13 Stephen Rothwell
  2013-08-13  6:22 ` Greg KH
  0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2013-08-13  6:13 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Ming Lei

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
include/linux/usb/usbnet.h between commit a88c32ae15f2 ("USBNET:
centralize computing of max rx/tx qlen") from the net-next tree and
commit 638c5115a794 ("USBNET: support DMA SG") 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 include/linux/usb/usbnet.h
index 8fbc008,2b47e63..0000000
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@@ -34,7 -34,7 +34,8 @@@ struct usbnet 
  	struct mutex		phy_mutex;
  	unsigned char		suspend_count;
  	unsigned char		pkt_cnt, pkt_err;
 +	unsigned short		rx_qlen, tx_qlen;
+ 	unsigned		can_dma_sg:1;
  
  	/* i/o info: pipes etc */
  	unsigned		in, out;

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

^ permalink raw reply	[flat|nested] 8+ messages in thread
* linux-next: manual merge of the usb tree with the net-next tree
@ 2019-08-09  5:19 Stephen Rothwell
  2019-08-09  8:53 ` Greg KH
  0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2019-08-09  5:19 UTC (permalink / raw)
  To: Greg KH, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Benjamin Poirier

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

Hi all,

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

  drivers/staging/Kconfig
  drivers/staging/Makefile

between commit:

  955315b0dc8c ("qlge: Move drivers/net/ethernet/qlogic/qlge/ to drivers/staging/qlge/")

from the net-next tree and commit:

  71ed79b0e4be ("USB: Move wusbcore and UWB to staging as it is obsolete")

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/staging/Kconfig
index 0b8a614be11e,cf419d9c942d..000000000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -120,6 -120,7 +120,9 @@@ source "drivers/staging/kpc2000/Kconfig
  
  source "drivers/staging/isdn/Kconfig"
  
 +source "drivers/staging/qlge/Kconfig"
 +
+ source "drivers/staging/wusbcore/Kconfig"
+ source "drivers/staging/uwb/Kconfig"
+ 
  endif # STAGING
diff --cc drivers/staging/Makefile
index 741152511a10,38179bc842a8..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -50,4 -50,5 +50,6 @@@ obj-$(CONFIG_EROFS_FS)		+= erofs
  obj-$(CONFIG_FIELDBUS_DEV)     += fieldbus/
  obj-$(CONFIG_KPC2000)		+= kpc2000/
  obj-$(CONFIG_ISDN_CAPI)		+= isdn/
 +obj-$(CONFIG_QLGE)		+= qlge/
+ obj-$(CONFIG_UWB)		+= uwb/
+ obj-$(CONFIG_USB_WUSB)		+= wusbcore/

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

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-08-09  9:18 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-21  6:10 linux-next: manual merge of the usb tree with the net-next tree Stephen Rothwell
2012-05-21  6:16 ` Kalle Valo
2012-05-21  6:28   ` Stephen Rothwell
2012-05-21 13:08 ` Greg KH
2013-08-13  6:13 Stephen Rothwell
2013-08-13  6:22 ` Greg KH
2019-08-09  5:19 Stephen Rothwell
2019-08-09  8:53 ` 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).