Commit 71d47b31 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

Merge branch 'mlx5-vhost' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git 



This merges a single commit that contains changes to mlx5_ifc.h
It's required to support vq descriptor mappings in mlx5/vdpa

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parents ffc25326 d424348b

include/linux/mlx5/mlx5_ifc.h

+7 −1
Original line number Diff line number Diff line
@@ -1231,7 +1231,13 @@ struct mlx5_ifc_virtio_emulation_cap_bits { 
	u8         max_emulated_devices[0x8];

	u8         max_num_virtio_queues[0x18];



	u8         reserved_at_a0[0x60];

	u8         reserved_at_a0[0x20];



	u8	   reserved_at_c0[0x13];

	u8         desc_group_mkey_supported[0x1];

	u8         reserved_at_d4[0xc];



	u8         reserved_at_e0[0x20];



	u8         umem_1_buffer_param_a[0x20];