projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fea07a4 a779d91)
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)
commit2da4c187aea31b870bf11c9e4d00581002002216
treed91f230d0e5eb35c09d7b7980c465508bbf5ea72tree | snapshot
parentfea07a487c6dd422dc8837237c9d2bc7c33119afcommit | diff
parenta779d91314ca7208b7feb3ad817b62904397c56dcommit | diff
Merge branch 'master' of git://git./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
MicroBlaze GIT Repository