| commit | 2da4c187aea31b870bf11c9e4d00581002002216 | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Wed Nov 04 08:12:52 2020 -0800 |
| committer | Jakub Kicinski <kuba@kernel.org> | Wed Nov 04 08:12:52 2020 -0800 |
| tree | d91f230d0e5eb35c09d7b7980c465508bbf5ea72 | |
| parent | fea07a487c6dd422dc8837237c9d2bc7c33119af [diff] | |
| parent | a779d91314ca7208b7feb3ad817b62904397c56d [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>