Merge remote-tracking branch 'origin/testing'
authorSteffen Klassert <steffen.klassert@secunet.com>
Tue, 21 Jul 2020 06:03:04 +0000 (08:03 +0200)
committerSteffen Klassert <steffen.klassert@secunet.com>
Tue, 21 Jul 2020 06:03:04 +0000 (08:03 +0200)
Sabrina Dubroca says:

====================
xfrm: a few fixes for espintc

Andrew Cagney reported some issues when trying to use async operations
on the encapsulation socket. Patches 1 and 2 take care of these bugs.

In addition, I missed a spot when adding IPv6 support and converting
to the common config option.
====================

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

Trivial merge