diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-29 16:31:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-29 16:31:22 -0700 |
| commit | f2b122d3d6ff2f2bef0f23e6cb2b56384da7f92a (patch) | |
| tree | 49fe392de941739cfcc800b299a47afba1b9f33c /kernel/gcov/gcc_base.c | |
| parent | f9e0ce3ddc48d51d5d16a4722b6406e5094375f6 (diff) | |
| parent | a683012a8e77675a1947cc8f11f97cdc1d5bb769 (diff) | |
Merge tag 'mlx5-fixes-2020-05-28' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5 fixes 2020-05-28
This series introduces some fixes to mlx5 driver.
v1->v2:
- Fix bad sha1, Jakub.
- Added one more patch by Pablo.
net/mlx5e: replace EINVAL in mlx5e_flower_parse_meta()
Nothing major, the only patch worth mentioning is the suspend/resume crash
fix by adding the missing pci device handlers, the fix is very straight
forward and as Dexuan already expressed, the patch is important for Azure
users to avoid crash on VM hibernation, patch is marked for -stable v4.6
below.
Conflict note:
('net/mlx5e: Fix MLX5_TC_CT dependencies') has a trivial one line conflict
with current net-next, which can be resolved by simply using the line from
net-next.
Please pull and let me know if there is any problem.
For -stable v4.6
('net/mlx5: Fix crash upon suspend/resume')
For -stable v5.6
('net/mlx5e: replace EINVAL in mlx5e_flower_parse_meta()')
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/gcov/gcc_base.c')
0 files changed, 0 insertions, 0 deletions