Messages in this thread | | | From | Jason Gunthorpe <> | Subject | Re: linux-next: build failure after merge of the net-next tree | Date | Fri, 12 Jul 2019 15:21:26 +0000 |
| |
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@mellanox.com> 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
| |