diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-04-30 09:26:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-30 09:26:13 -0400 |
| commit | a658a3f2ecbabba60dafa9ba94f12fc25c18474f (patch) | |
| tree | 964095a11024f13be1347c787bec2140a7d82673 /tools | |
| parent | net: phy: micrel: make sure the factory test bit is cleared (diff) | |
| parent | xfrm: remove unneeded export_symbols (diff) | |
| download | linux-dev-a658a3f2ecbabba60dafa9ba94f12fc25c18474f.tar.xz linux-dev-a658a3f2ecbabba60dafa9ba94f12fc25c18474f.zip | |
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-04-30
1) A lot of work to remove indirections from the xfrm code.
From Florian Westphal.
2) Support ESP offload in combination with gso partial.
From Boris Pismenny.
3) Remove some duplicated code from vti4.
From Jeremy Sowden.
Please note that there is merge conflict
between commit:
8742dc86d0c7 ("xfrm4: Fix uninitialized memory read in _decode_session4")
from the ipsec tree and commit:
c53ac41e3720 ("xfrm: remove decode_session indirection from afinfo_policy")
from the ipsec-next tree. The merge conflict will appear
when those trees get merged during the merge window.
The conflict can be solved as it is done in linux-next:
https://lkml.org/lkml/2019/4/25/1207
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/net/config | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index e9c860d00416..474040448601 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -7,9 +7,7 @@ CONFIG_NET_L3_MASTER_DEV=y CONFIG_IPV6=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_VETH=y -CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_NET_IPVTI=y -CONFIG_INET6_XFRM_MODE_TUNNEL=y CONFIG_IPV6_VTI=y CONFIG_DUMMY=y CONFIG_BRIDGE=y |