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>,
Arnd Bergmann <arnd@arndb.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Sasha Levin <sashal@kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the char-misc.current tree
Date: Wed, 12 Dec 2018 09:29:49 +0100 [thread overview]
Message-ID: <20181212082949.GC13212@kroah.com> (raw)
In-Reply-To: <20181212120252.5260cb22@canb.auug.org.au>
On Wed, Dec 12, 2018 at 12:02:52PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> cb4f131e1f2c ("MAINTAINERS: Patch monkey for the Hyper-V code")
>
> from the char-misc.current tree and commit:
>
> b255e500c8dc ("net: documentation: build a directory structure for drivers")
>
> 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 MAINTAINERS
> index 4a2a30380bed,a676b40ac1d6..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -6930,11 -6902,9 +6931,11 @@@ Hyper-V CORE AND DRIVER
> M: "K. Y. Srinivasan" <kys@microsoft.com>
> M: Haiyang Zhang <haiyangz@microsoft.com>
> M: Stephen Hemminger <sthemmin@microsoft.com>
> +M: Sasha Levin <sashal@kernel.org>
> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
> L: devel@linuxdriverproject.org
> -S: Maintained
> +S: Supported
> - F: Documentation/networking/netvsc.txt
> + F: Documentation/networking/device_drivers/microsoft/netvsc.txt
> F: arch/x86/include/asm/mshyperv.h
> F: arch/x86/include/asm/trace/hyperv.h
> F: arch/x86/include/asm/hyperv-tlfs.h
Looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2018-12-12 8:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-12 1:02 linux-next: manual merge of the net-next tree with the char-misc.current tree Stephen Rothwell
2018-12-12 8:29 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-02-01 1:11 Stephen Rothwell
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=20181212082949.GC13212@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=jakub.kicinski@netronome.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sashal@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;
as well as URLs for NNTP newsgroup(s).