]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76da432 078ac74)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorJakub Kicinski <kuba@kernel.org>
Wed, 4 Nov 2020 16:12:52 +0000 (08:12 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 4 Nov 2020 16:12:52 +0000 (08:12 -0800)
commit43e2a6a43eb4020ef633e2b3ff8b81b630681a66
treed91f230d0e5eb35c09d7b7980c465508bbf5ea72tree | snapshot
parent76da432fde2dfc6bbfd347538257720af55c9d23commit | diff
parent078ac74f68cf8e7ae79ea66ce1db8a7f788cbda2commit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
1) Fix packet receiving of standard IP tunnels when the xfrm_interface
   module is installed. From Xin Long.

2) Fix a race condition between spi allocating and hash list
   resizing. From zhuoliang zhang.
====================

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/xfrm/xfrm_interface.c diff1 | diff2 | blob | history
net/xfrm/xfrm_state.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.