From: Christoph Paasch <cpaasch at apple.com>
To: mptcp at lists.01.org
Subject: [MPTCP] Re: [GIT] Sync with net-next on 20190131: a few conflicts
Date: Tue, 04 Feb 2020 07:40:12 -0800 [thread overview]
Message-ID: <20200204154012.GF33105@MacBook-Pro-64.local> (raw)
In-Reply-To: 91c726c1-6425-8b63-2f6f-b4ff803c9b93@tessares.net
[-- Attachment #1: Type: text/plain, Size: 1399 bytes --]
On 04/02/20 - 15:58:49, Matthieu Baerts wrote:
> Hello,
>
> On 02/02/2020 09:38, Matthieu Baerts wrote:
> > On 31/01/2020 18:42, Matthieu Baerts wrote:
> > > Hello,
> > >
> > > It seems that recently, 'net-next' has been synced with 'net' which
> > > contains some modifications in MPTCP code. We then had a few
> > > conflicts due to Florian's patch-set, see: 55c6ab4b368 (Merge branch
> > > 'mptcp-fix-sockopt-crash-and-lockdep-splats')
> > >
> > > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=d55c6ab4b368633f39f8fe059f3b877f978cfb4c
> >
> >
> > FYI, I was not able to validate the new version after having resolved
> > conflicts because it crashed before starting MPTCP:
>
> Again FYI, net-next has been updated a few minutes ago and it includes a fix
> for the crash I reported 2 days ago.
> After a rebase, the CI has just validated the new "export" branch and all
> tests are passing.
Great! I move syzkaller on top of the export-branch then.
Christoph
>
> Cheers,
> Matt
> --
> Matthieu Baerts | R&D Engineer
> matthieu.baerts(a)tessares.net
> Tessares SA | Hybrid Access Solutions
> www.tessares.net
> 1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
> _______________________________________________
> mptcp mailing list -- mptcp(a)lists.01.org
> To unsubscribe send an email to mptcp-leave(a)lists.01.org
next reply other threads:[~2020-02-04 15:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 15:40 Christoph Paasch [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-02-04 14:58 [MPTCP] Re: [GIT] Sync with net-next on 20190131: a few conflicts Matthieu Baerts
2020-02-02 8:38 Matthieu Baerts
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=20200204154012.GF33105@MacBook-Pro-64.local \
--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.