Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
drivers/staging/Kconfig
drivers/staging/Makefile
between commit:
df4028658f9d ("staging: Add VirtualBox guest shared folder (vboxsf) support")
from the staging.current tree and commit:
52340b82cf1a ("hp100: Move 100BaseVG AnyLAN driver to staging")
from the net-next 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 927d29eb92c6,333308fe807e..000000000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -125,6 -125,6 +125,8 @@@ source "drivers/staging/exfat/Kconfig
source "drivers/staging/qlge/Kconfig"
+source "drivers/staging/vboxsf/Kconfig"
+
+ source "drivers/staging/hp/Kconfig"
+
endif # STAGING
diff --cc drivers/staging/Makefile
index f01f04199073,e4943cd63e98..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -53,4 -53,4 +53,5 @@@ 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/
Attachment:
pgpc9Ynuz3qJL.pgp
Description: OpenPGP digital signature
