diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-11-13 11:28:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-13 11:28:54 -0800 |
| commit | 895badff2c2b68c67e77a4537754a46026d4c2d7 (patch) | |
| tree | 4b6add060d8cb9eef3ee936a2ea6234c71be518c /LICENSES | |
| parent | Merge branch 'ARM-Enable-GENET-support-for-RPi-4' (diff) | |
| parent | xfrm: ifdef setsockopt(UDP_ENCAP_ESPINUDP/UDP_ENCAP_ESPINUDP_NON_IKE) (diff) | |
| download | linux-dev-895badff2c2b68c67e77a4537754a46026d4c2d7.tar.xz linux-dev-895badff2c2b68c67e77a4537754a46026d4c2d7.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-11-13
1) Remove a unnecessary net_exit function from the xfrm interface.
From Xin Long.
2) Assign xfrm4_udp_encap_rcv to a UDP socket only if xfrm
is configured. From Alexey Dobriyan.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'LICENSES')
0 files changed, 0 insertions, 0 deletions