On Mon, Apr 29, 2019 at 06:22:03PM +0000, Saeed Mahameed wrote: > On Mon, 2019-04-29 at 11:34 +0300, Leon Romanovsky wrote: > > From: Mark Zhang <ma...@mellanox.com> > > > > Support bind a qp with counter. If counter is null then bind the qp > > to > > the default counter. Different QP state has different operation: > > - RESET: Set the counter field so that it will take effective > > during RST2INIT change; > > - RTS: Issue an RTS2RTS change to update the QP counter; > > - Other: Set the counter field and mark the counter_pending flag, > > when QP is moved to RTS state and this flag is set, then issue > > an RTS2RTS modification to update the counter. > > > > Signed-off-by: Mark Zhang <ma...@mellanox.com> > > Reviewed-by: Majd Dibbiny <m...@mellanox.com> > > Signed-off-by: Leon Romanovsky <leo...@mellanox.com> > > --- > > drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 +++ > > drivers/infiniband/hw/mlx5/qp.c | 76 > > +++++++++++++++++++++++++++- > > include/linux/mlx5/qp.h | 1 + > > I don't see any reason why this patch should go to mlx5-next branch. > Just because you have one liner in include/linux/mlx5/qp.h, is not > enough reason. >
I'm changing target automatically based on get_maintainer.pl output. If "$GET_MAINTAINER --email --nol --nos --nosubsystem --noroles $_file | grep Saeed -c" returns Saeed, it means that such patch has all potential to create merge conflict. Thanks
