diff options
| author | Maxime Ripard | 2019-02-19 11:17:05 +0100 |
|---|---|---|
| committer | Maxime Ripard | 2019-02-19 11:17:05 +0100 |
| commit | ae6ba10d5090fc7e9095eaef3dcf06ba016725a6 (patch) | |
| tree | e631eaa2df52712783acc4d757841da4890c4143 /drivers/net/Kconfig | |
| parent | drm: Remove set but not used variable 'gem' (diff) | |
| parent | Merge v5.0-rc7 into drm-next (diff) | |
| download | kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.gz kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.xz kernel-qcow2-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.zip | |
Merge drm/drm-next into drm-misc-next
Backmerge drm-next to bring in -rc7
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 6371958dd170..21bf8ac78380 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -197,9 +197,9 @@ config VXLAN config GENEVE tristate "Generic Network Virtualization Encapsulation" - depends on INET && NET_UDP_TUNNEL + depends on INET depends on IPV6 || !IPV6 - select NET_IP_TUNNEL + select NET_UDP_TUNNEL select GRO_CELLS ---help--- This allows one to create geneve virtual interfaces that provide @@ -519,7 +519,7 @@ config NET_FAILOVER and destroy a failover master netdev and manages a primary and standby slave netdevs that get registered via the generic failover infrastructure. This can be used by paravirtual drivers to enable - an alternate low latency datapath. It alsoenables live migration of + an alternate low latency datapath. It also enables live migration of a VM with direct attached VF by failing over to the paravirtual datapath when the VF is unplugged. |