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

[Greg KH]

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