Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

2019-08-23 Thread Jason Gunthorpe
On Fri, Aug 23, 2019 at 12:22:27PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rdma tree got a conflict in: > > drivers/infiniband/hw/mlx5/mlx5_ib.h > > between commit: > > 0e6613b41edd ("IB/mlx5: Consolidate use_umr checks into single function") > > from t

linux-next: manual merge of the rdma tree with the rdma-fixes tree

2019-08-22 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/hw/mlx5/mlx5_ib.h between commit: 0e6613b41edd ("IB/mlx5: Consolidate use_umr checks into single function") from the rdma-fixes tree and commit: 3e1f000ff746 ("IB/mlx5: Support per device q counters

Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-07-09 Thread Leon Romanovsky
On Tue, Jul 10, 2018 at 11:17:40AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rdma tree got a conflict in: > > drivers/infiniband/core/uverbs_cmd.c > > between commit: > > 4fae7f170416 ("RDMA/uverbs: Fix slab-out-of-bounds in > ib_uverbs_ex_create_flow") > > f

linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-07-09 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/core/uverbs_cmd.c between commit: 4fae7f170416 ("RDMA/uverbs: Fix slab-out-of-bounds in ib_uverbs_ex_create_flow") from the rdma-fixes tree and commit: 2cc1e3b80942 ("IB/uverbs: Replace file->uconte

Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-06-26 Thread Leon Romanovsky
On Wed, Jun 27, 2018 at 10:07:26AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rdma tree got a conflict in: > > drivers/infiniband/core/uverbs_cmd.c > > between commit: > > 940efcc8889f ("RDMA/uverbs: Protect from attempts to create flows on > unsupported QP")

linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-06-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/core/uverbs_cmd.c between commit: 940efcc8889f ("RDMA/uverbs: Protect from attempts to create flows on unsupported QP") from the rdma-fixes tree and commit: e99028ad76e7 ("RDMA/uverbs: Check existen

Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-05-02 Thread Jason Gunthorpe
On Wed, May 02, 2018 at 10:00:52AM -0400, Doug Ledford wrote: > On Wed, 2018-05-02 at 13:22 +0300, Leon Romanovsky wrote: > > On Mon, Apr 30, 2018 at 08:55:35PM -0400, Doug Ledford wrote: > > > On Tue, 2018-05-01 at 10:10 +1000, Stephen Rothwell wrote: > > > > Hi all, > > > > > > > > Today's linux

Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-05-02 Thread Doug Ledford
On Wed, 2018-05-02 at 13:22 +0300, Leon Romanovsky wrote: > On Mon, Apr 30, 2018 at 08:55:35PM -0400, Doug Ledford wrote: > > On Tue, 2018-05-01 at 10:10 +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > Today's linux-next merge of the rdma tree got a conflict in: > > > > > > drivers/inf

Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-05-02 Thread Leon Romanovsky
On Mon, Apr 30, 2018 at 08:55:35PM -0400, Doug Ledford wrote: > On Tue, 2018-05-01 at 10:10 +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the rdma tree got a conflict in: > > > > drivers/infiniband/sw/rxe/rxe_resp.c > > > > between commit: > > > > 9fd4350ba895 (

Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-04-30 Thread Doug Ledford
On Tue, 2018-05-01 at 10:10 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rdma tree got a conflict in: > > drivers/infiniband/sw/rxe/rxe_resp.c > > between commit: > > 9fd4350ba895 ("B/rxe: avoid double kfree_skb") > > from the rdma-fixes tree and commit: >

linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-04-30 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/sw/rxe/rxe_resp.c between commit: 9fd4350ba895 ("B/rxe: avoid double kfree_skb") from the rdma-fixes tree and commit: 2e47350789eb ("IB/rxe: optimize the function duplicate_request") from the rdma t

linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-03-21 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/core/ucma.c between commit: e8980d67d601 ("RDMA/ucma: Ensure that CM_ID exists prior to access it") from the rdma-fixes tree and commit: 00313983cda6 ("DMA/nldev: provide detailed CM_ID information")

Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-01-16 Thread Jason Gunthorpe
On Wed, Jan 17, 2018 at 12:55:37PM +1100, Stephen Rothwell wrote: > Hi all, > > On Wed, 17 Jan 2018 12:51:45 +1100 Stephen Rothwell > wrote: > > > > diff --cc drivers/infiniband/hw/mlx5/qp.c > > index cffe5966aef9,ae36db3d0deb.. > > +++ b/drivers/infiniband/hw/mlx5/qp.c > > @@@ -4361

Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-01-16 Thread Stephen Rothwell
Hi all, On Wed, 17 Jan 2018 12:51:45 +1100 Stephen Rothwell wrote: > > diff --cc drivers/infiniband/hw/mlx5/qp.c > index cffe5966aef9,ae36db3d0deb.. > --- a/drivers/infiniband/hw/mlx5/qp.c > +++ b/drivers/infiniband/hw/mlx5/qp.c > @@@ -4361,12 -4674,12 +4674,11 @@@ static void to_rdm

linux-next: manual merge of the rdma tree with the rdma-fixes tree

2018-01-16 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/hw/mlx5/qp.c between commit: ae59c3f0b6cf ("RDMA/mlx5: Fix out-of-bound access while querying AH") from the rdma-fixes tree and commit: 508562d6f708 ("IB/mlx5: Reduce the use of num_port capability")