diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-23 23:37:47 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-23 23:37:47 +0300 |
| commit | 7679f864a0b18aa6a6a870fb4f5169426ae1a3ef (patch) | |
| tree | 2aadc086763f4d0d71a90b85a3122aa83d1d0321 /fs | |
| parent | d02f304b4b60e4acd15bcf04c401cac1f7adf77c (diff) | |
| parent | 747b67088f8d34b3ec64d31447a1044be92dd348 (diff) | |
| download | linux-7679f864a0b18aa6a6a870fb4f5169426ae1a3ef.tar.xz | |
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 2021-04-23
1) The SPI flow key in struct flowi has no consumers,
so remove it. From Florian Westphal.
2) Remove stray synchronize_rcu from xfrm_init.
From Florian Westphal.
3) Use the new exit_pre hook to reset the netlink socket
on net namespace destruction. From Florian Westphal.
4) Remove an unnecessary get_cpu() in ipcomp, that
code is always called with BHs off.
From Sabrina Dubroca.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions