From: David S. Miller <davem@davemloft.net>
Date: Wed, 13 Nov 2019 19:28:54 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Tag: microblaze-v5.6-rc1~181^2~118
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=895badff2c2b68c67e77a4537754a46026d4c2d7;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 2019-11-13

1) Remove a unnecessary net_exit function from the xfrm interface.
   From Xin Long.

2) Assign xfrm4_udp_encap_rcv to a UDP socket only if xfrm
   is configured. From Alexey Dobriyan.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

895badff2c2b68c67e77a4537754a46026d4c2d7