From: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
To: Dexuan Cui <decui@microsoft.com>
Cc: David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
KY Srinivasan <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>
Subject: Re: When will net-next merge with linux-next?
Date: Mon, 14 Mar 2016 09:21:39 -0700 [thread overview]
Message-ID: <20160314162139.GA2925@kroah.com> (raw)
In-Reply-To: <BLUPR03MB14106249C57CCF66717CC860BF880@BLUPR03MB1410.namprd03.prod.outlook.com>
On Mon, Mar 14, 2016 at 06:09:41AM +0000, Dexuan Cui wrote:
> Hi David,
> I have a pending patch of the hv_sock driver, which should go into the
> kernel through the net-next tree:
> https://lkml.org/lkml/2016/2/14/7
>
> The VMBus side's supporting patches of hv_sock have been in Greg's tree
> and linux-next for more than 1 month, but they haven't been in net-next
> yet, I suppose this is because of the releasing of 4.5.
>
> Now 4.5 is released. Will you merge with Greg's tree or linux-next?
linux-next is a merge of all of the maintainer's trees, and it is
rebased every day, it's impossible to merge that back into a maintainers
tree, sorry.
> I read netdev-FAQ.txt, but still don't have a clear idea about how things
> work in my case.
Try reading Documentation/development-process/ please. Things will get
merged together into Linus's tree over the next 2 weeks as we ask him to
pull our trees.
thanks,
greg k-h
next prev parent reply other threads:[~2016-03-14 16:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-14 6:09 When will net-next merge with linux-next? Dexuan Cui
2016-03-14 16:21 ` gregkh [this message]
2016-03-15 11:11 ` Dexuan Cui
2016-03-15 15:05 ` gregkh
2016-03-16 1:58 ` Dexuan Cui
2016-03-16 2:40 ` gregkh
2016-03-16 2:58 ` Dexuan Cui
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=20160314162139.GA2925@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=kys@microsoft.com \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.