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: Wed, 25 Apr 2018 16:19:38 -0700	[thread overview]
Message-ID: <alpine.OSX.2.21.1804251617340.2926@jateran-mobl1.amr.corp.intel.com> (raw)

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

             reply	other threads:[~2018-04-25 23:19 UTC|newest]

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

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.1804251617340.2926@jateran-mobl1.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.