Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the net-next tree with the staging.current tree
@ 2019-11-05  1:21 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-11-05  1:21 UTC (permalink / raw)
  To: David Miller, Networking, Greg KH
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Hans de Goede, Joe Perches

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

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05  1:21 linux-next: manual merge of the net-next tree with the staging.current tree Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git