]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 Jul 2022 12:25:39 +0000 (13:25 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Jul 2022 12:25:39 +0000 (13:25 +0100)
commit01d4914c8bbe5b443698e656f22df383a6db2bf9
treec3ed571bf7c664f44b08c740b60fbb5cb7057fd0
parentf92288c661fb500f0f97fce8b31dd8681846e514
parent21148d1e1332c21181d8a15310ad89d19cc5c2d8
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 2022-07-20

1) Don't set DST_NOPOLICY in IPv4, a recent patch made this
   superfluous. From Eyal Birger.

2) Convert alg_key to flexible array member to avoid an iproute2
   compile warning when built with gcc-12.
   From Stephen Hemminger.

3) xfrm_register_km and xfrm_unregister_km do always return 0
   so change the type to void. From Zhengchao Shao.

4) Fix spelling mistake in esp6.c
   From Zhang Jiaming.

5) Improve the wording of comment above XFRM_OFFLOAD flags.
   From Petr VanÄ›k.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/route.h
include/net/xfrm.h
net/ipv4/route.c
net/xfrm/xfrm_state.c