linux-next: manual merge of the staging tree with the staging.current and net-next trees

linux-next: manual merge of the staging tree with the staging.current and net-next trees

[Stephen Rothwell]

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

Hi all,

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

  drivers/staging/Kconfig
  drivers/staging/Makefile

between commits:

  df4028658f9d ("staging: Add VirtualBox guest shared folder (vboxsf) support")
  52340b82cf1a ("hp100: Move 100BaseVG AnyLAN driver to staging")

from the staging.current and net-next trees and commit:

  a7a91ca5a23d ("staging: wfx: add infrastructure for new driver")

from the staging 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 be74f91500b3,a490141a0e88..000000000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -125,8 -125,6 +125,10 @@@ source "drivers/staging/exfat/Kconfig
  
  source "drivers/staging/qlge/Kconfig"
  
 +source "drivers/staging/vboxsf/Kconfig"
 +
 +source "drivers/staging/hp/Kconfig"
 +
+ source "drivers/staging/wfx/Kconfig"
+ 
  endif # STAGING
diff --cc drivers/staging/Makefile
index b8bd05091453,4cb548a0ff87..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -53,5 -53,4 +53,6 @@@ obj-$(CONFIG_UWB)		+= uwb
  obj-$(CONFIG_USB_WUSB)		+= wusbcore/
  obj-$(CONFIG_EXFAT_FS)		+= exfat/
  obj-$(CONFIG_QLGE)		+= qlge/
 +obj-$(CONFIG_VBOXSF_FS)		+= vboxsf/
 +obj-$(CONFIG_NET_VENDOR_HP)	+= hp/
+ obj-$(CONFIG_WFX)		+= wfx/

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

Re: linux-next: manual merge of the staging tree with the staging.current and net-next trees

[Greg KH]

On Tue, Nov 05, 2019 at 04:53:13PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got conflicts in:
> 
>   drivers/staging/Kconfig
>   drivers/staging/Makefile
> 
> between commits:
> 
>   df4028658f9d ("staging: Add VirtualBox guest shared folder (vboxsf) support")
>   52340b82cf1a ("hp100: Move 100BaseVG AnyLAN driver to staging")
> 
> from the staging.current and net-next trees and commit:
> 
>   a7a91ca5a23d ("staging: wfx: add infrastructure for new driver")
> 
> from the staging 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.

Thanks for this, I knew it would happen :(

greg k-h