When will net-next merge with linux-next?

When will net-next merge with linux-next?

[Dexuan Cui]

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?

I read netdev-FAQ.txt, but still don't have a clear idea about how things
work in my case.

Thanks,
-- Dexuan

Re: When will net-next merge with linux-next?

[gregkh]

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

RE: When will net-next merge with linux-next?

[Dexuan Cui]

> From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
> Sent: Tuesday, March 15, 2016 0:22
> To: Dexuan Cui <decui@microsoft.com>
> Cc: David Miller <davem@davemloft.net>; netdev@vger.kernel.org; KY
> Srinivasan <kys@microsoft.com>; Haiyang Zhang <haiyangz@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

Re: When will net-next merge with linux-next?

[gregkh]

On Tue, Mar 15, 2016 at 11:11:34AM +0000, Dexuan Cui wrote:
> 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?

You missed 4.6 as your patch was not in any of our trees a few days
before 4.5 was released, sorry.

greg k-h

RE: When will net-next merge with linux-next?

[Dexuan Cui]

> From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
> Sent: Tuesday, March 15, 2016 23:06
> To: Dexuan Cui <decui@microsoft.com>
> Cc: David Miller <davem@davemloft.net>; netdev@vger.kernel.org; KY
> Srinivasan <kys@microsoft.com>; Haiyang Zhang <haiyangz@microsoft.com>
> Subject: Re: When will net-next merge with linux-next?
> 
> On Tue, Mar 15, 2016 at 11:11:34AM +0000, Dexuan Cui wrote:
> > 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?
> 
> You missed 4.6 as your patch was not in any of our trees a few days
> before 4.5 was released, sorry.
> 
> greg k-h
Hi Greg,
Thanks for the reply!

My patch has to go in net-next first, but even today's mainline and net-next
haven't had the supporting patches in the VMBus driver, so I can't post my
patch to net-next even today  -- it seems it's doomed to need 2 major
release cycles to push a feature that makes changes to 2 subsystems? :-(

I guess Greg will send a pull request to Linus within the next 1~2 weeks, so
the supporting VMBus patches will be in the mainline after that.

Hi David,
May I know when you'll merge with the mainline kernel and how
frequently do you usually do it?

Thanks,
-- Dexuan

Re: When will net-next merge with linux-next?

[gregkh]

On Wed, Mar 16, 2016 at 01:58:50AM +0000, Dexuan Cui wrote:
> > From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
> > Sent: Tuesday, March 15, 2016 23:06
> > To: Dexuan Cui <decui@microsoft.com>
> > Cc: David Miller <davem@davemloft.net>; netdev@vger.kernel.org; KY
> > Srinivasan <kys@microsoft.com>; Haiyang Zhang <haiyangz@microsoft.com>
> > Subject: Re: When will net-next merge with linux-next?
> > 
> > On Tue, Mar 15, 2016 at 11:11:34AM +0000, Dexuan Cui wrote:
> > > 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?
> > 
> > You missed 4.6 as your patch was not in any of our trees a few days
> > before 4.5 was released, sorry.
> > 
> > greg k-h
> Hi Greg,
> Thanks for the reply!
> 
> My patch has to go in net-next first, but even today's mainline and net-next
> haven't had the supporting patches in the VMBus driver, so I can't post my
> patch to net-next even today  -- it seems it's doomed to need 2 major
> release cycles to push a feature that makes changes to 2 subsystems? :-(

Usually, yes, unless you talk to us ahead of time so we can coordinate,
or have one of the patches go through a different tree (i.e. all in one
tree.).

Just wait until 4.6-rc1 is out and all will be fine.

greg k-h

RE: When will net-next merge with linux-next?

[Dexuan Cui]

> From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
> Sent: Wednesday, March 16, 2016 10:41
> To: Dexuan Cui <decui@microsoft.com>
> Cc: David Miller <davem@davemloft.net>; netdev@vger.kernel.org; KY
> Srinivasan <kys@microsoft.com>; Haiyang Zhang <haiyangz@microsoft.com>
> Subject: Re: When will net-next merge with linux-next?
> 
> On Wed, Mar 16, 2016 at 01:58:50AM +0000, Dexuan Cui wrote:
> > > From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
> > > Sent: Tuesday, March 15, 2016 23:06
> > > To: Dexuan Cui <decui@microsoft.com>
> > > Cc: David Miller <davem@davemloft.net>; netdev@vger.kernel.org; KY
> > > Srinivasan <kys@microsoft.com>; Haiyang Zhang <haiyangz@microsoft.com>
> > > Subject: Re: When will net-next merge with linux-next?
> > >
> > > On Tue, Mar 15, 2016 at 11:11:34AM +0000, Dexuan Cui wrote:
> > > > 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?
> > >
> > > You missed 4.6 as your patch was not in any of our trees a few days
> > > before 4.5 was released, sorry.
> > >
> > > greg k-h
> > Hi Greg,
> > Thanks for the reply!
> >
> > My patch has to go in net-next first, but even today's mainline and net-next
> > haven't had the supporting patches in the VMBus driver, so I can't post my
> > patch to net-next even today  -- it seems it's doomed to need 2 major
> > release cycles to push a feature that makes changes to 2 subsystems? :-(
> 
> Usually, yes, unless you talk to us ahead of time so we can coordinate,
> or have one of the patches go through a different tree (i.e. all in one
> tree.).

Greg, Thanks for your patient explanation!
I thought the patch (AF_HYPERV) must go through net-next. 
 
> Just wait until 4.6-rc1 is out and all will be fine.
> 
> greg k-h

BTW, I saw this in Documentation/development-process/2.Process:

"As a general rule, if you miss the merge window for a given feature, the
best thing to do is to wait for the next development cycle.  (An occasional
exception is made for drivers for previously-unsupported hardware; if they
touch no in-tree code, they cannot cause regressions and should be safe to
add at any time)"

I hope David could make an exception for the AF_HYPERV patch, since it
is a new driver, touching no in-tree code and unlikely to cause regressions. :-)

And actually the new driver won't be automatically loaded -- a user must
manually load it before the feature can be used.

Thanks,
-- Dexuan