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

2020-05-13 Thread Leon Romanovsky
On Thu, May 14, 2020 at 12:59:20PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > drivers/infiniband/hw/mlx5/main.c > > between commit: > > 2be08c308f10 ("RDMA/mlx5: Delete create QP flags obfuscation") > > from the rdma tree a

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

2019-07-08 Thread Jason Gunthorpe
On Mon, Jul 08, 2019 at 01:28:37PM +1000, Stephen Rothwell wrote: > Hi all, > > On Thu, 4 Jul 2019 12:47:38 +1000 Stephen Rothwell > wrote: > > > > Hi all, > > > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > > > drivers/infiniband/hw/mlx5/cq.c > > > > between commi

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

2019-07-07 Thread Stephen Rothwell
Hi all, On Thu, 4 Jul 2019 12:47:38 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > drivers/infiniband/hw/mlx5/cq.c > > between commit: > > e39afe3d6dbd ("RDMA: Convert CQ allocations to be under core > responsibility")

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

2019-07-03 Thread Leon Romanovsky
On Thu, Jul 04, 2019 at 12:47:38PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > drivers/infiniband/hw/mlx5/cq.c > > between commit: > > e39afe3d6dbd ("RDMA: Convert CQ allocations to be under core > responsibility") > > from

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

2018-12-04 Thread Leon Romanovsky
On Wed, Dec 05, 2018 at 01:10:50PM +1100, Stephen Rothwell wrote: > Hi Doug, > > On Tue, 04 Dec 2018 20:33:08 -0500 Doug Ledford wrote: > > > > FWIW this will go away in a day or two. I merged mlx5-next into rdma > > for-next in order to take a series that depended on it. > > Understood, thanks.

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

2018-12-04 Thread Stephen Rothwell
Hi Doug, On Tue, 04 Dec 2018 20:33:08 -0500 Doug Ledford wrote: > > FWIW this will go away in a day or two. I merged mlx5-next into rdma > for-next in order to take a series that depended on it. Understood, thanks. -- Cheers, Stephen Rothwell pgpzySMSxk_jZ.pgp Description: OpenPGP digital s

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

2018-12-04 Thread Doug Ledford
FWIW this will go away in a day or two. I merged mlx5-next into rdma for-next in order to take a series that depended on it. On Wed, 2018-12-05 at 12:07 +1100, Stephen Rothwell wrote: > Hi Leon, > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > drivers/infiniband/hw/ml

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

2018-11-20 Thread Leon Romanovsky
On Wed, Nov 21, 2018 at 11:04:32AM +1100, Stephen Rothwell wrote: > Hi Leon, > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > drivers/infiniband/hw/mlx5/main.c > > between commit: > > 9afc97c29b03 ("mlx5: remove support for ib_get_vector_affinity") > > from the rdma tre