From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "David Miller" <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Hans de Goede" <hdegoede@redhat.com>,
"Joe Perches" <joe@perches.com>,
"Jérôme Pouiller" <jerome.pouiller@silabs.com>
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 [thread overview]
Message-ID: <20191105072050.GB2587462@kroah.com> (raw)
In-Reply-To: <20191105165313.59a5cc11@canb.auug.org.au>
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
prev parent reply other threads:[~2019-11-05 7:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
Reply instructions:
You may reply publicly 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191105072050.GB2587462@kroah.com \
--to=greg@kroah.com \
--cc=davem@davemloft.net \
--cc=hdegoede@redhat.com \
--cc=jerome.pouiller@silabs.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox