On Thu, Apr 05, 2018 at 06:53:21PM +0300, Leon Romanovsky wrote: > From: Leon Romanovsky <leonro@xxxxxxxxxxxx> > > Changelog; > v1->v2: > * Slightly changed allocation algorithm > * Removed uverbs_dealloc_dm() > * Fixed error-handling paths > * Used __aligned_u64 > v0->v1: The main change that Ariel moved almost all alloc/dealloc code > from netdev part of mlx5 driver to ib part. > ------------------------------------------------------------------------ > Hi > > The feature itself is implemented on top of new ioctl() infrastructure, > the patches itself are stacked on previously sent IPsec series. In > addition to being tied to IPsec, this series will have extremely minor > conflict with Dave's netdev tree. > > --- a/include/linux/mlx5/device.h > +++ b/include/linux/mlx5/device.h > @@@ -1016,7 -1018,7 +1021,8 @@@ enum mlx5_cap_type > MLX5_CAP_RESERVED, > MLX5_CAP_VECTOR_CALC, > MLX5_CAP_QOS, > + MLX5_CAP_DEBUG, > + MLX5_CAP_RESERVED_14, > + MLX5_CAP_DEV_MEM, > /* NUM OF CAP Types */ > MLX5_CAP_NUM > }; This looks like it is refering to firmware structures so order matters here? If there are firmware bits they should have explicit numbers, IMHO. So after merge resolution we must have MLX5_CAP_DEV_MEM = 15 MLX5_CAP_DEBUG = 13 ? > Ariel Levkovich (8): > IB/uverbs: Expose device memory capabilities to user > IB/uverbs: Add device memory capabilities reporting > IB/uverbs: Add alloc/free dm uverbs ioctl support > IB/uverbs: Add device memory registration ioctl support > net/mlx5: Query device memory capabilities > IB/mlx5: Device memory support in mlx5_ib > net/mlx5: Mkey creation command adjustments > IB/mlx5: Device memory mr registration support Applied to for-next, thanks Jason -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html