Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the staging tree with the staging.current and net-next trees
@ 2019-11-05  5:53 Stephen Rothwell
  2019-11-05  7:20 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-11-05  5:53 UTC (permalink / raw)
  To: Greg KH, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Hans de Goede, Joe Perches, Jérôme Pouiller

[-- 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 --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the staging tree with the staging.current and net-next trees
  2019-11-05  5:53 linux-next: manual merge of the staging tree with the staging.current and net-next trees Stephen Rothwell
@ 2019-11-05  7:20 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2019-11-05  7:20 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List, Hans de Goede, Joe Perches,
	Jérôme Pouiller

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05  5:53 linux-next: manual merge of the staging tree with the staging.current and net-next trees Stephen Rothwell
2019-11-05  7:20 ` Greg KH

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