diff options
| author | David S. Miller | 2017-08-07 19:42:09 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-08-07 19:42:09 +0200 |
| commit | fde6af4729b005dc9dc936b0ed9f1b27b5b2d0f4 (patch) | |
| tree | fb52e170a7b2130b8a5266ac665d4314447fef95 /drivers/net/vsockmon.c | |
| parent | Merge branch 'net-sched-summer-cleanup-part-2-ndo_setup_tc' (diff) | |
| parent | net/mlx5: Increase the maximum flow counters supported (diff) | |
| download | kernel-qcow2-linux-fde6af4729b005dc9dc936b0ed9f1b27b5b2d0f4.tar.gz kernel-qcow2-linux-fde6af4729b005dc9dc936b0ed9f1b27b5b2d0f4.tar.xz kernel-qcow2-linux-fde6af4729b005dc9dc936b0ed9f1b27b5b2d0f4.zip | |
Merge tag 'mlx5-shared-2017-08-07' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Saeed Mahameed says:
====================
mlx5-shared-2017-08-07
This series includes some mlx5 updates for both net-next and rdma trees.
From Saeed,
Core driver updates to allow selectively building the driver with
or without some large driver components, such as
- E-Switch (Ethernet SRIOV support).
- Multi-Physical Function Switch (MPFs) support.
For that we split E-Switch and MPFs functionalities into separate files.
From Erez,
Delay mlx5_core events when mlx5 interfaces, namely mlx5_ib, registration
is taking place and until it completes.
From Rabie,
Increase the maximum supported flow counters.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vsockmon.c')
0 files changed, 0 insertions, 0 deletions