[MPTCP] Updated net-next merge

[MPTCP] Updated net-next merge

[Mat Martineau]

[-- Attachment #1: Type: text/plain, Size: 279 bytes --]


Hello everyone -

I updated the master branch at 
https://github.com/multipath-tcp/mptcp_net-next

There were no complicated merge conflicts this time, and just one minor 
fixup commit.

I plan to merge with net-next about once a week.

--
Mat Martineau
Intel OTC

Re: [MPTCP] Updated net-next merge

[Christoph Paasch]

[-- Attachment #1: Type: text/plain, Size: 680 bytes --]

Hello Mat,

On 18/05/18 - 17:10:43, Mat Martineau wrote:
> 
> Hello everyone -
> 
> I updated the master branch at https://github.com/multipath-tcp/mptcp_net-next
> 
> There was a conflict this time, due to an upstream change in the pacing
> timer callback from hard irq to soft irq context:
> 
> https://github.com/multipath-tcp/mptcp_net-next/commit/73a6bab5aa2a83cb7df85805e08bc03b4065aea7
> 
> 
> Here's the fixup commit with the relevant changes to tcp_tsq_handler() and
> its call to mptcp_tsq_flags():
> 
> https://github.com/multipath-tcp/mptcp_net-next/commit/6ae85f7b54d5766131170b363cbeb86e421ced26

this looks good to me!


Cheers,
Christoph

[MPTCP] Updated net-next merge

[Mat Martineau]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]


Hello everyone -

I updated the master branch at https://github.com/multipath-tcp/mptcp_net-next

There was a conflict this time, due to an upstream change in the pacing 
timer callback from hard irq to soft irq context:

https://github.com/multipath-tcp/mptcp_net-next/commit/73a6bab5aa2a83cb7df85805e08bc03b4065aea7


Here's the fixup commit with the relevant changes to tcp_tsq_handler() and 
its call to mptcp_tsq_flags():

https://github.com/multipath-tcp/mptcp_net-next/commit/6ae85f7b54d5766131170b363cbeb86e421ced26


--
Mat Martineau
Intel OTC

[MPTCP] Updated net-next merge

[Mat Martineau]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]


Hello -

I updated the master branch at https://github.com/multipath-tcp/mptcp_net-next

It was a fairly clean merge, only two minor conflicts in tcp_input.c


Regards,

--
Mat Martineau
Intel OTC