diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-01-21 12:18:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-21 12:18:20 +0100 |
| commit | 4f2c17e0f3324b3b82a3e0985245aefd6dcc5495 (patch) | |
| tree | 997228d030d9f3c168f3e2d4d55246cbbc55026e /drivers/net/ethernet/amd | |
| parent | drivers: net: declance: fix comparing pointer to 0 (diff) | |
| parent | xfrm: add espintcp (RFC 8229) (diff) | |
| download | linux-dev-4f2c17e0f3324b3b82a3e0985245aefd6dcc5495.tar.xz linux-dev-4f2c17e0f3324b3b82a3e0985245aefd6dcc5495.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2020-01-21
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.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd')
0 files changed, 0 insertions, 0 deletions