]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8484f5 8edcc3f)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 Nov 2019 19:28:54 +0000 (11:28 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Nov 2019 19:28:54 +0000 (11:28 -0800)
commit75c5c97a9872ed338a21f0942cdc9096907dfa2a
tree4b6add060d8cb9eef3ee936a2ea6234c71be518ctree | snapshot
parente8484f50a25ace281e58462e169c6e66c2ce6e3ccommit | diff
parent8edcc3fdb804aaad8d38cd3b3b040724836f2343commit | 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>
net/ipv4/udp.c diff1 | diff2 | blob | history
net/xfrm/xfrm_interface.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.