Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* 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

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

On Fri, Aug 09, 2019 at 03:19:40PM +1000, Stephen Rothwell wrote:
> 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/


Merge looks good to me, thanks!

greg k-h

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

* Re: 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, 0 replies; 8+ messages in thread
From: Greg KH @ 2013-08-13  6:22 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Ming Lei

On Tue, Aug 13, 2013 at 04:13:59PM +1000, Stephen Rothwell wrote:
> 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).

Yeah, I knew that would happen, it was the easiest way to get these
patches in due to the cross-tree dependancies.  The fix looks correct,
thanks.

greg k-h

^ 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

* Re: 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
  1 sibling, 0 replies; 8+ messages in thread
From: Greg KH @ 2012-05-21 13:08 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Sarah Sharp, Kalle Valo, David Miller,
	netdev, John W. Linville

On Mon, May 21, 2012 at 04:10:08PM +1000, Stephen Rothwell wrote:
> 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.

Looks good to me, thanks.

greg k-h

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

* Re: linux-next: manual merge of the usb tree with the net-next tree
  2012-05-21  6:16 ` Kalle Valo
@ 2012-05-21  6:28   ` Stephen Rothwell
  0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2012-05-21  6:28 UTC (permalink / raw)
  To: Kalle Valo
  Cc: Greg KH, linux-next, linux-kernel, Sarah Sharp, David Miller,
	netdev, John W. Linville

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

Hi Kalle,

On Mon, 21 May 2012 09:16:57 +0300 Kalle Valo <kvalo@qca.qualcomm.com> wrote:
>
> Is there anything I should do in ath6kl to handle the issue?

No, Linus will take care of it when he merges the two trees.

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

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

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

* Re: 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  6:28   ` Stephen Rothwell
  2012-05-21 13:08 ` Greg KH
  1 sibling, 1 reply; 8+ messages in thread
From: Kalle Valo @ 2012-05-21  6:16 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Greg KH, linux-next, linux-kernel, Sarah Sharp, David Miller,
	netdev, John W. Linville

On 05/21/2012 09:10 AM, Stephen Rothwell wrote:

> 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.

Is there anything I should do in ath6kl to handle the issue?

Kalle

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

* 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

end of thread, back to index

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

Linux-Next Archive on lore.kernel.org

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

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


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