From: David S. Miller <davem@davemloft.net>
Date: Wed, 2 May 2018 17:29:13 +0000 (-0400)
Subject: Merge branch 'net-smc-small-features'
X-Git-Tag: v4.18-rc1~114^2~323
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77ec3a0e2dae1cd47ccc097599a71aee0ec738d4;p=thirdparty%2Flinux.git

Merge branch 'net-smc-small-features'

Ursula Braun says:

====================
net/smc: small features 2018/04/30

here are 4 smc patches for net-next covering small new features
in different areas:
   * link health check
   * diagnostics for IPv6 smc sockets
   * ioctl
   * improvement for vlan determination

v2 changes:
   * better title
   * patch 2 - remove compile problem for disabled CONFIG_IPV6
====================

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

77ec3a0e2dae1cd47ccc097599a71aee0ec738d4