• David S. Miller's avatar
    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next · 4f2c17e0
    David S. Miller authored
    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:
    
    3c32da19 ("unix: Show number of pending scm files of receive queue in fdinfo")
    
    from the net-next tree and commit:
    
    b50b0580 ("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: default avatarDavid S. Miller <davem@davemloft.net>
    4f2c17e0
af_unix.c 68.2 KB