netdev - Re: [PATCH net v2 0/2] mptcp: Prevent tcp_push() crash and selftest temp file buildup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 1 Sep 2021 19:19:08 +0200
From:   Matthieu Baerts <matthieu.baerts@...sares.net>
To:     Jakub Kicinski <kuba@...nel.org>
Cc:     "David S. Miller" <davem@...emloft.net>, mptcp@...ts.linux.dev,
        Mat Martineau <mathew.j.martineau@...ux.intel.com>,
        netdev@...r.kernel.org, Paolo Abeni <pabeni@...hat.com>
Subject: Re: [PATCH net v2 0/2] mptcp: Prevent tcp_push() crash and selftest
 temp file buildup

Hi Jakub,

On 01/09/2021 19:16, Jakub Kicinski wrote:
> On Wed, 1 Sep 2021 18:09:52 +0200 Matthieu Baerts wrote:
>> Git auto-resolves conflicts. Is it why it is considered as "Not
>> Applicable" or did we miss something else?
> 
> We don't enable 3-way merges for patches applied from the list, usually.

Thank you for your reply, we didn't know that, that's clearer!

>> Do we just need to resend these patches after a rebase?
> 
> Yes please.

Just did, thank you!

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net