Linux-Next Archive on
 help / color / Atom feed
From: Greg KH <>
To: Stephen Rothwell <>
Cc: "David Miller" <>,
	Networking <>,
	"Linux Next Mailing List" <>,
	"Linux Kernel Mailing List" <>,
	"Hans de Goede" <>,
	"Joe Perches" <>,
	"Jérôme Pouiller" <>
Subject: Re: linux-next: manual merge of the staging tree with the staging.current and net-next trees
Date: Tue, 5 Nov 2019 08:20:50 +0100
Message-ID: <> (raw)
In-Reply-To: <>

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

      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-05  5:53 Stephen Rothwell
2019-11-05  7:20 ` Greg KH [this message]

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on

Archives are clonable:
	git clone --mirror 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/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone