From: David S. Miller <davem@davemloft.net>
Date: Tue, 21 Jan 2020 11:18:20 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Tag: microblaze-v5.7-rc1~165^2~48
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=4f2c17e0f3324b3b82a3e0985245aefd6dcc5495;p=linux-2.6-microblaze.git

Merge branch 'master' of git://git./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>
---

4f2c17e0f3324b3b82a3e0985245aefd6dcc5495
diff --cc net/unix/af_unix.c
index 6756a3ccc392,a7f707fc4cac..321af97c7bbe
--- a/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;