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

2020-05-09 Thread Saeed Mahameed
On Fri, 2020-05-08 at 09:35 -0300, Jason Gunthorpe wrote: > On Fri, May 08, 2020 at 01:18:51PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the net-next tree got a conflict in: > > > > drivers/net/bonding/bond_main.c > > > > between commits: > > > >

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

2020-05-09 Thread Saeed Mahameed
On Fri, 2020-05-08 at 13:18 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/bonding/bond_main.c > > between commits: > > ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves") > c071d91d2a89 ("bonding: Add

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

2020-05-08 Thread Jason Gunthorpe
On Fri, May 08, 2020 at 01:18:51PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/bonding/bond_main.c > > between commits: > > ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves") > c071d91d2a89

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

2020-05-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/bonding/bond_main.c between commits: ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves") c071d91d2a89 ("bonding: Add helper function to get the xmit slave based on hash") 29d5bbccb3a1

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

2019-06-19 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/infiniband/hw/nes/nes.c between commit: 2d3c72ed5041 ("rdma: Remove nes") from the rdma tree and commit: 2638eb8b50cf ("net: ipv4: provide __rcu annotation for ifa_list") from the net-next tree. I fixed

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

2019-02-28 Thread Leon Romanovsky
On Wed, Feb 27, 2019 at 11:24:51AM -0500, Doug Ledford wrote: > On Wed, 2019-02-27 at 11:25 +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the net-next tree got a conflict in: > > > > drivers/infiniband/hw/mlx4/Kconfig > > > > between commit: > > > >

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

2019-02-27 Thread Doug Ledford
On Wed, 2019-02-27 at 11:25 +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/infiniband/hw/mlx4/Kconfig > > between commit: > > 6fa8f1afd337 ("IB/{core,uverbs}: Move ib_umem_xxx functions from ib_core to >

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

2019-02-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/infiniband/hw/mlx4/Kconfig between commit: 6fa8f1afd337 ("IB/{core,uverbs}: Move ib_umem_xxx functions from ib_core to ib_uverbs") from the rdma tree and commit: f4b6bcc7002f ("net: devlink: turn devlink

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

2019-02-18 Thread Leon Romanovsky
On Mon, Feb 18, 2019 at 11:05:49AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/infiniband/hw/mlx5/ib_rep.c > > between commits: > > 459cc69fa4c1 ("RDMA: Provide safe ib_alloc_device() function") > fc9e4477f924

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

2019-02-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/infiniband/hw/mlx5/ib_rep.c between commits: 459cc69fa4c1 ("RDMA: Provide safe ib_alloc_device() function") fc9e4477f924 ("RDMA/mlx5: Fix memory leak in case we fail to add an IB device") from the rdma