diff options
| author | David S. Miller <davem@davemloft.net> | 2022-07-25 14:25:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-25 14:25:39 +0200 |
| commit | e222dc8d8408788e906a5c0dd5f01fbe7f6cd1d3 (patch) | |
| tree | c3ed571bf7c664f44b08c740b60fbb5cb7057fd0 /net/llc | |
| parent | Merge branch 'macb-versal-device-support' (diff) | |
| parent | xfrm: improve wording of comment above XFRM_OFFLOAD flags (diff) | |
| download | linux-e222dc8d8408788e906a5c0dd5f01fbe7f6cd1d3.tar.xz linux-e222dc8d8408788e906a5c0dd5f01fbe7f6cd1d3.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 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>
Diffstat (limited to 'net/llc')
0 files changed, 0 insertions, 0 deletions