Merge branch 'vxlan-disabled-ipv6'
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 May 2017 02:30:13 +0000 (22:30 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 May 2017 02:30:13 +0000 (22:30 -0400)
Jiri Benc says:

====================
vxlan: do not error out on disabled IPv6

This patchset fixes a bug with metadata based tunnels when booted with
ipv6.disable=1.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge