]> Git Repo - linux.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorJakub Kicinski <[email protected]>
Wed, 4 Nov 2020 16:12:52 +0000 (08:12 -0800)
committerJakub Kicinski <[email protected]>
Wed, 4 Nov 2020 16:12:52 +0000 (08:12 -0800)
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 <[email protected]>
1  2 
net/xfrm/xfrm_interface.c
net/xfrm/xfrm_state.c

Simple merge
Simple merge
This page took 0.066936 seconds and 4 git commands to generate.