From: Matthieu Baerts <matthieu.baerts at tessares.net>
To: mptcp at lists.01.org
Subject: Re: [MPTCP] [GIT] Sync with net-next: conflict
Date: Tue, 21 May 2019 16:09:09 +0200 [thread overview]
Message-ID: <19598e54-ed65-a32f-26ae-b2b06193dd58@tessares.net> (raw)
In-Reply-To: f22b9f0c6f2ab53325570a0b2427279c7d04929b.camel@redhat.com
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
On 21/05/2019 16:03, Paolo Abeni wrote:
> Hi,
>
> On Tue, 2019-05-21 at 14:26 +0200, Matthieu Baerts wrote:
>>
>> The commit 8b2e02e94442 (tcp: clean ext on tx recycle) from Paolo was
>> conflicting with a new one from upstream: (tcp: do not
>> recycle cloned skbs) from Eric Dumazet.
>>
>> I simply added the new condition (&& !skb_cloned(skb)). I hope it is
>> alright: a73376082e4c6e3c9a48fd887f759ab1e4118477
>
> The conflict resolution LGTM, thanks!
>
> Not sure if the following actually makes any sense, if the merge commit
> could be squashed into "tcp: clean ext on tx recycle" that would
> simplify/cleanup the git history.
Sorry, the commit I mentioned is one from the topgit tree. During the
export, it is "squashed" correctly:
https://github.com/multipath-tcp/mptcp_net-next/commit/eddf1c63aa7f382376638ab96082dc773c30eb50
Is it fine for you?
Cheers,
Matt
> Cheers,
>
> Paolo
>
--
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
next reply other threads:[~2019-05-21 14:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-21 14:09 Matthieu Baerts [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-05-21 14:10 [MPTCP] [GIT] Sync with net-next: conflict Paolo Abeni
2019-05-21 14:03 Paolo Abeni
2019-05-21 12:26 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=19598e54-ed65-a32f-26ae-b2b06193dd58@tessares.net \
--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.