> From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org] > Sent: Tuesday, March 15, 2016 0:22 > To: Dexuan Cui <de...@microsoft.com> > Cc: David Miller <da...@davemloft.net>; netdev@vger.kernel.org; KY > Srinivasan <k...@microsoft.com>; Haiyang Zhang <haiya...@microsoft.com> > Subject: Re: When will net-next merge with linux-next? > > 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.
Greg, thanks for the reply! > > 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. > > greg k-h I read the development-process documents. Since 4.5 was released and Linus's merge window is open for 4.6, I guess what will happen next is: 1. Linus will pull from char-misc.git and net-netx.git; 2. David will merge with Linus's mainline tree; 3. I can post my patch to net-next.git then. I'm wondering whether (and when) step 2 will happen in the next 2 weeks, that is, before the tag 4.6-rc1 is made. If not, I guess I'll miss 4.6? Thanks, -- Dexuan
