| commit | 77ec3a0e2dae1cd47ccc097599a71aee0ec738d4 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed May 02 13:29:13 2018 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Wed May 02 13:29:13 2018 -0400 |
| tree | de4b7fd5d06c7221a155a9bf9000f513b93c4275 | |
| parent | e90c1a1090cccf833080b512746f24667985ed73 [diff] | |
| parent | cb9d43f6775457cac75544bc4197f26ac2b6f294 [diff] |
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>