From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <netdev-owner@vger.kernel.org>
Received: from mail-pg0-f53.google.com ([74.125.83.53]:44913 "EHLO
        mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751687AbeCODPK (ORCPT
        <rfc822;netdev@vger.kernel.org>); Wed, 14 Mar 2018 23:15:10 -0400
Subject: Re: [PATCH v2 iproute2-next 0/6] cm_id, cq, mr, and pd resource
 tracking
To: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Leon Romanovsky <leon@kernel.org>, stephen@networkplumber.org,
        Steve Wise <swise@opengridcomputing.com>,
        netdev@vger.kernel.org, linux-rdma@vger.kernel.org
References: <cover.1520020530.git.swise@opengridcomputing.com>
 <0b9901d3ba15$1ac4a1d0$504de570$@opengridcomputing.com>
 <87cc06e1-0e54-12f7-a9b0-326e568c3d6f@gmail.com>
 <20180313083211.GB1080@mtr-leonro.local>
 <dde7cc61-22af-b589-348f-e91c6657a289@gmail.com>
 <20180313211355.GD21498@ziepe.ca>
From: David Ahern <dsahern@gmail.com>
Message-ID: <e0daff32-9957-e90b-e82e-b1352f42d6e4@gmail.com>
Date: Wed, 14 Mar 2018 20:14:53 -0700
MIME-Version: 1.0
In-Reply-To: <20180313211355.GD21498@ziepe.ca>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On 3/13/18 2:13 PM, Jason Gunthorpe wrote:
> Could you pull the uapi headers from linux-next? That tree will have
> both netdev and rdma stuff merged together properly.

What's the merge history between linux-next, Linus' tree, net-next +
rdma-next?