Re: linux-next: manual merge of the usb tree with the net-next tree

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

linux-next: manual merge of the usb tree with the net-next tree

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 wusbc

Re: linux-next: manual merge of the usb tree with the net-next tree

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

linux-next: manual merge of the usb tree with the net-next tree

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