Request for net merge into net-next

Request for net merge into net-next

[Paolo Abeni]

Hi,

We have a few net-next MPTCP changes depending on:

commit 9e365ff576b7c1623bbc5ef31ec652c533e2f65e
mptcp: drop MP_JOIN request sock on syn cookies
    
commit 8fd4de1275580a1befa1456d1070eaf6489fb48f
mptcp: cache msk on MP_JOIN init_req

Could you please merge net into net-next so that we can post without
causing later conflicts?

Thank you!

Paolo

Re: Request for net merge into net-next

[David Miller]

From: Paolo Abeni <pabeni@redhat.com>
Date: Thu, 25 Jun 2020 11:16:47 +0200

> We have a few net-next MPTCP changes depending on:
> 
> commit 9e365ff576b7c1623bbc5ef31ec652c533e2f65e
> mptcp: drop MP_JOIN request sock on syn cookies
>     
> commit 8fd4de1275580a1befa1456d1070eaf6489fb48f
> mptcp: cache msk on MP_JOIN init_req
> 
> Could you please merge net into net-next so that we can post without
> causing later conflicts?

I'm going to send a pull request for 'net' to Linus and once he takes that
I'll sync everything.

Thank you.

Re: Request for net merge into net-next

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Thu, 25 Jun 2020 12:21:37 -0700 (PDT)

> From: Paolo Abeni <pabeni@redhat.com>
> Date: Thu, 25 Jun 2020 11:16:47 +0200
> 
>> We have a few net-next MPTCP changes depending on:
>> 
>> commit 9e365ff576b7c1623bbc5ef31ec652c533e2f65e
>> mptcp: drop MP_JOIN request sock on syn cookies
>>     
>> commit 8fd4de1275580a1befa1456d1070eaf6489fb48f
>> mptcp: cache msk on MP_JOIN init_req
>> 
>> Could you please merge net into net-next so that we can post without
>> causing later conflicts?
> 
> I'm going to send a pull request for 'net' to Linus and once he takes that
> I'll sync everything.

This is now done.

Re: Request for net merge into net-next

[Paolo Abeni]

On Thu, 2020-06-25 at 19:40 -0700, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Thu, 25 Jun 2020 12:21:37 -0700 (PDT)
> 
> > From: Paolo Abeni <pabeni@redhat.com>
> > Date: Thu, 25 Jun 2020 11:16:47 +0200
> > 
> >> We have a few net-next MPTCP changes depending on:
> >> 
> >> commit 9e365ff576b7c1623bbc5ef31ec652c533e2f65e
> >> mptcp: drop MP_JOIN request sock on syn cookies
> >>     
> >> commit 8fd4de1275580a1befa1456d1070eaf6489fb48f
> >> mptcp: cache msk on MP_JOIN init_req
> >> 
> >> Could you please merge net into net-next so that we can post without
> >> causing later conflicts?
> > 
> > I'm going to send a pull request for 'net' to Linus and once he takes that
> > I'll sync everything.
> 
> This is now done.
> 
Thank you!

I will spam the ML with patches soon ;)

/P

Request for net merge into net-next

[Matthieu Baerts]

Hi David, Jakub,

We have a few net-next MPTCP changes depending on:

- 57025817eaa4 ("mptcp: fix subflow's local_id issues")
- 2ff0e566faa4 ("mptcp: fix subflow's remote_id issues")
- f612eb76f349 ("mptcp: fix kmalloc flag in mptcp_pm_nl_get_local_id")

We guess you are going to send a pull request for 'net' to Linus soon 
and sync everything once it is done. But just in case, if not, could you 
please merge 'net' into 'net-next' so that we can post without causing 
conflicts later and issues in tests?

Thank you!

Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Re: Request for net merge into net-next

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Mon, 15 Apr 2019 13:24:17 -0700 (PDT)

> From: Felix Fietkau <nbd@nbd.name>
> Date: Fri, 12 Apr 2019 21:41:36 +0200
> 
>> I have a whole bunch of pending mt76 changes for -next which depend on
>> these two commits:
>> 
>> commit 2b4a66980217332d91ab1785e1750857d6d52bc8
>> mac80211: make ieee80211_schedule_txq schedule empty TXQs
>> 
>> commit 5b989c18dab2e82bac8a5564a174794bf84b20e6
>> mac80211: rework locking for txq scheduling / airtime fairness
>> 
>> Could you please merge net into net-next so that Kalle can take them
>> into wireless-drivers-next?
> 
> I'll try to make this happen in the next 24 hours.

Sorry, it took a little longer than expected.

This is now done.

Re: Request for net merge into net-next

[David Miller]

From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 12 Apr 2019 21:41:36 +0200

> I have a whole bunch of pending mt76 changes for -next which depend on
> these two commits:
> 
> commit 2b4a66980217332d91ab1785e1750857d6d52bc8
> mac80211: make ieee80211_schedule_txq schedule empty TXQs
> 
> commit 5b989c18dab2e82bac8a5564a174794bf84b20e6
> mac80211: rework locking for txq scheduling / airtime fairness
> 
> Could you please merge net into net-next so that Kalle can take them
> into wireless-drivers-next?

I'll try to make this happen in the next 24 hours.

Thanks!

Request for net merge into net-next

[Felix Fietkau]

Hi Dave,

I have a whole bunch of pending mt76 changes for -next which depend on
these two commits:

commit 2b4a66980217332d91ab1785e1750857d6d52bc8
mac80211: make ieee80211_schedule_txq schedule empty TXQs

commit 5b989c18dab2e82bac8a5564a174794bf84b20e6
mac80211: rework locking for txq scheduling / airtime fairness

Could you please merge net into net-next so that Kalle can take them
into wireless-drivers-next?

Thanks,

- Felix