tree 4b6add060d8cb9eef3ee936a2ea6234c71be518c
parent 90bc72b13c08eedf73b7c0bd94ef23c467800c4a
parent fd1ac07f3f17fbbc2f08e3b43951bed937d86a7b
author David S. Miller <davem@davemloft.net> 1573673334 -0800
committer David S. Miller <davem@davemloft.net> 1573673334 -0800

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 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>