| commit | 895badff2c2b68c67e77a4537754a46026d4c2d7 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Nov 13 11:28:54 2019 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Wed Nov 13 11:28:54 2019 -0800 |
| tree | 4b6add060d8cb9eef3ee936a2ea6234c71be518c | |
| parent | 90bc72b13c08eedf73b7c0bd94ef23c467800c4a [diff] | |
| parent | fd1ac07f3f17fbbc2f08e3b43951bed937d86a7b [diff] |
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>