Merge remote-tracking branch 'ipsec-next/master'

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

diff --cc tools/testing/selftests/net/Makefile
index ee2e27b1cd0d36b291d8db627c79f9c7678e9365,2ab3e3437a928bb35d5ee6efa31be3ccd0488f2a..522b22dd89da1fe42ed23301d0ee036ec7f0c29a
--- 1/tools/testing/selftests/net/Makefile
--- 2/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -4,10 -4,11 +4,11 @@@
  CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g
  CFLAGS += -I../../../../usr/include/
  
- TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh rtnetlink.sh
+ TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \
+             rtnetlink.sh xfrm_policy.sh
  TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh udpgso.sh ip_defrag.sh
  TEST_PROGS += udpgso_bench.sh fib_rule_tests.sh msg_zerocopy.sh psock_snd.sh
 -TEST_PROGS += udpgro_bench.sh udpgro.sh
 +TEST_PROGS += udpgro_bench.sh udpgro.sh test_vxlan_under_vrf.sh
  TEST_PROGS_EXTENDED := in_netns.sh
  TEST_GEN_FILES =  socket
  TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy