From: Jason Gunthorpe
Date: Thu, 22 Mar 2018 22:33:15 -0600
> Doug and I moved to a shared repo location when we started maintain it
> as a team:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
>
> The commit is here:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdm
On Fri, Mar 23, 2018 at 12:19:00AM -0400, David Miller wrote:
> From: Doug Ledford
> Date: Thu, 15 Mar 2018 21:18:02 -0400
>
> > Here's the commit (from the rdma git repo) with the proper merge fix
> > (although it also has other minor merge stuff that needs to be ignored):
> >
> > 2d873449a202
From: Doug Ledford
Date: Thu, 15 Mar 2018 21:18:02 -0400
> Here's the commit (from the rdma git repo) with the proper merge fix
> (although it also has other minor merge stuff that needs to be ignored):
>
> 2d873449a202 (Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next)
Really?
[davem
On Thu, 2018-03-15 at 21:18 -0400, Doug Ledford wrote:
> On Fri, 2018-03-16 at 11:56 +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the net-next tree got a conflict in:
> >
> > drivers/infiniband/hw/mlx5/main.c
> >
> > between commit:
> >
> > 42cea83f9524 ("I
On Thu, Mar 15, 2018 at 09:18:02PM -0400, Doug Ledford wrote:
> Here's the commit (from the rdma git repo) with the proper merge fix
> (although it also has other minor merge stuff that needs to be ignored):
>
> 2d873449a202 (Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next)
Stephen,
On Fri, 2018-03-16 at 11:56 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/main.c
>
> between commit:
>
> 42cea83f9524 ("IB/mlx5: Fix cleanup order on unload")
>
> from the rdma-fixes tree and com
