diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-05 19:39:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-05 19:39:13 -0400 |
| commit | bc321ed2db8ee03b2f2ba809286d3bf4eef1e5e0 (patch) | |
| tree | 525962c2f147a22285a41dcc9edaeb6fe63398e4 /net/mpls/af_mpls.c | |
| parent | 7aab5159fa0100ee3f80d1b0f55cd7e9b5823270 (diff) | |
| parent | 2d3c739739e64619f4846746a06ff0a6adf8a155 (diff) | |
Merge branch 'mlx4'
Or Gerlitz says:
====================
mlx4 fixes for 4.1-rc2
Eran's fix is for a small off-by-one introduces on 4.1-rc1.
Yisahi fixes an issue with comes into play only on VMs with
many (> 256) vCPUs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls/af_mpls.c')
0 files changed, 0 insertions, 0 deletions