netdev - Re: pull request (net-next): ipsec-next 2020-01-21

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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20200121.122228.846015323929949931.davem@davemloft.net>
Date:   Tue, 21 Jan 2020 12:22:28 +0100 (CET)
From:   David Miller <davem@...emloft.net>
To:     steffen.klassert@...unet.com
Cc:     herbert@...dor.apana.org.au, netdev@...r.kernel.org
Subject: Re: pull request (net-next): ipsec-next 2020-01-21

From: Steffen Klassert <steffen.klassert@...unet.com>
Date: Tue, 21 Jan 2020 08:38:52 +0100

> 1) Add support for TCP encapsulation of IKE and ESP messages,
>    as defined by RFC 8229. Patchset from Sabrina Dubroca.
> 
> Please note that there is a merge conflict in:
> 
> net/unix/af_unix.c
> 
> between commit:
> 
> 3c32da19a858 ("unix: Show number of pending scm files of receive queue in fdinfo")
> 
> from the net-next tree and commit:
> 
> b50b0580d27b ("net: add queue argument to __skb_wait_for_more_packets and __skb_{,try_}recv_datagram")
> 
> from the ipsec-next tree.
> 
> The conflict can be solved as done in linux-next.
> 
> Please pull or let me know if there are problems.

Pulled, thanks for the info about the merge conflict.