Merge remote-tracking branch 'origin/testing'

Xin Long says:

====================
xfrm: not register one xfrm(6)_tunnel object twice

Now in ip(6)_vti and xfrm interface tunnel support, it uses the
same xfrm(6)_tunnel object to handle for AF_NET and AF_INET6 by
registering it twice.

However the xfrm(6)_tunnel object is linked into a list with its
'next' pointer. The second registering will cause its 'next'
pointer to be overwritten, and break the list.

So this patchset is to add a new xfrm(6)_tunnel object for each
of them and register it, although its members are the same with
the old one.
====================

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