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

1) Add IPv6 encapsulation support for ESP over UDP and TCP.
   From Sabrina Dubroca.

2) Remove unneeded reference when initializing xfrm interfaces.
   From Nicolas Dichtel.

3) Remove some indirect calls from the state_afinfo.
   From Florian Westphal.

Please note that this pull request has two merge conflicts

between commit:

  960a0a7543d8 ("xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish")

  from Linus' tree and commit:

    093b5a5476ed ("xfrm: remove output_finish indirection from xfrm_state_afinfo")

    from the ipsec-next tree.

and between commit:

  1cb8f8d4f0bc ("ipv6: move SIOCADDRT and SIOCDELRT handling into ->compat_ioctl")

  from the net-next tree and commit:

    7cb6b7642922 ("xfrm: add support for UDPv6 encapsulation of ESP")

    from the ipsec-next tree.

Both conflicts can be resolved as done in linux-next.
====================

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

diff --cc include/net/ipv6_stubs.h
Simple merge

diff --cc net/ipv4/Kconfig
Simple merge

diff --cc net/ipv6/Kconfig
Simple merge

diff --cc net/ipv6/af_inet6.c
index 0625a97a8894f270fbfb62d99178dcce66fa58fd,aa4882929fd05227f476cc223c3f89089e43aa84..b304b882e0312f3d53bad4551399cfb118367cdd
--- 1/net/ipv6/af_inet6.c
--- 2/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@@ -60,7 -60,7 +60,8 @@@
  #include <net/calipso.h>
  #include <net/seg6.h>
  #include <net/rpl.h>
 +#include <net/compat.h>
+ #include <net/xfrm.h>
  
  #include <linux/uaccess.h>
  #include <linux/mroute6.h>