Re: linux-next: build failure after merge of the net-next tree
From: Jason Gunthorpe
Date: Fri Jul 12 2019 - 11:21:32 EST
On Fri, Jul 12, 2019 at 11:45:57AM +1000, Stephen Rothwell wrote:
> Hi Jason,
>
> On Thu, 11 Jul 2019 14:33:07 +0000 Jason Gunthorpe <jgg@xxxxxxxxxxxx> wrote:
> >
> > I've added this patch to the rdma tree to fix the missing locking.
> >
> > The merge resolution will be simply swapping
> > for_ifa to in_dev_for_each_ifa_rtnl.
>
> OK, I added the below merge resolution patch to the merge of the rdma
> tree today (since Linus' has merged the net-next tree now).
Yes, this is what I'm planning on using
Thanks,
Jason