Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

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>

diff --cc include/linux/skbuff.h
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/unix/af_unix.c
index 6756a3c,a7f707f..321af97
--- 1/net/unix/af_unix.c
--- 2/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@@ -2100,8 -2058,8 +2100,8 @@@ static int unix_dgram_recvmsg(struct so
                mutex_lock(&u->iolock);
  
                skip = sk_peek_offset(sk, flags);
-               skb = __skb_try_recv_datagram(sk, flags, scm_stat_del,
-                                             &skip, &err, &last);
+               skb = __skb_try_recv_datagram(sk, &sk->sk_receive_queue, flags,
 -                                            NULL, &skip, &err, &last);
++                                            scm_stat_del, &skip, &err, &last);
                if (skb)
                        break;