diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2026-06-24 13:40:39 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2026-06-24 13:41:41 +0200 |
| commit | 91b16b53a08c3684ea2b0ad3cbf8ecd48c0f8b77 (patch) | |
| tree | 977e7a4d4484bf69d61d3a16aa33474f74f97c81 /include/linux | |
| parent | bb365a506b1e6fb050c0fceaad354fe395385ef0 (diff) | |
| parent | babe08404e1993697a523e60bc0f9d096ffe1ef8 (diff) | |
Merge tag 'kvm-s390-next-7.2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
* Fix S390_USER_OPEREXEC so it can now be enabled regardless of other
unrelated capabilities
* Fix handling of the _PAGE_UNUSED pte bit that could lead to guest
memory corruption in some scenarios
* A bunch of misc gmap fixes (locking, behaviour under memory pressure)
* Fix CMMA dirty tracking
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx5/vport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mlx5/vport.h b/include/linux/mlx5/vport.h index dfa2fe32217a..282ed5442282 100644 --- a/include/linux/mlx5/vport.h +++ b/include/linux/mlx5/vport.h @@ -102,8 +102,8 @@ int mlx5_query_hca_vport_node_guid(struct mlx5_core_dev *dev, int mlx5_query_nic_vport_mac_list(struct mlx5_core_dev *dev, u16 vport, enum mlx5_list_type list_type, - u8 addr_list[][ETH_ALEN], - int *list_size); + u8 (**mac_list)[ETH_ALEN], + int *mac_list_size); int mlx5_modify_nic_vport_mac_list(struct mlx5_core_dev *dev, enum mlx5_list_type list_type, u8 addr_list[][ETH_ALEN], |