From: David S. Miller <davem@davemloft.net>
Date: Mon, 1 May 2017 02:30:13 +0000 (-0400)
Subject: Merge branch 'vxlan-disabled-ipv6'
X-Git-Tag: v5.15~11411^2~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4879789b1fd9764df4465e80096b31d9466de0b;p=platform%2Fkernel%2Flinux-starfive.git

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

c4879789b1fd9764df4465e80096b31d9466de0b