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)
commitc4879789b1fd9764df4465e80096b31d9466de0b
treed67b515cb3a68a29cf5132a94f1be454fc6c5264
parent90a1bb98167c75b65e2a0527ef9200d172be3442
parentbaf4d7860771287f30fbe9b6b2dc18b04361439d
Merge branch 'vxlan-disabled-ipv6'

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>