From: Jakub Kicinski <kuba@kernel.org>
Date: Wed, 4 Nov 2020 16:12:52 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
X-Git-Tag: v5.10-rc3~30^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2da4c187aea31b870bf11c9e4d00581002002216;p=linux-2.6-block.git

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>
---

2da4c187aea31b870bf11c9e4d00581002002216