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
