All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mat Martineau <mathew.j.martineau at linux.intel.com>
To: mptcp at lists.01.org
Subject: [MPTCP] Updated net-next merge
Date: Fri, 18 May 2018 17:10:43 -0700	[thread overview]
Message-ID: <alpine.OSX.2.21.1805181657560.16804@johnferg-ivm.amr.corp.intel.com> (raw)

[-- 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

             reply	other threads:[~2018-05-19  0:10 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-19  0:10 Mat Martineau [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-05-21 16:41 [MPTCP] Updated net-next merge Christoph Paasch
2018-05-03 22:27 Mat Martineau
2018-04-25 23:19 Mat Martineau

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=alpine.OSX.2.21.1805181657560.16804@johnferg-ivm.amr.corp.intel.com \
    --to=unknown@example.com \
    /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.