Return-Path: Received: from mail-it0-f48.google.com ([209.85.214.48]:37463 "EHLO mail-it0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751781AbeCODf7 (ORCPT ); Wed, 14 Mar 2018 23:35:59 -0400 Received: by mail-it0-f48.google.com with SMTP id k79-v6so7364976ita.2 for ; Wed, 14 Mar 2018 20:35:58 -0700 (PDT) Date: Wed, 14 Mar 2018 21:29:33 -0600 From: Jason Gunthorpe To: David Ahern Cc: Leon Romanovsky , stephen@networkplumber.org, Steve Wise , netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: Re: [PATCH v2 iproute2-next 0/6] cm_id, cq, mr, and pd resource tracking Message-ID: <20180315032933.GE17669@ziepe.ca> References: <0b9901d3ba15$1ac4a1d0$504de570$@opengridcomputing.com> <87cc06e1-0e54-12f7-a9b0-326e568c3d6f@gmail.com> <20180313083211.GB1080@mtr-leonro.local> <20180313211355.GD21498@ziepe.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: On Wed, Mar 14, 2018 at 08:14:53PM -0700, David Ahern wrote: > 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? Not sure I understand the question? linux-next is thrown away every cycle, so for instance you can't say "took uapi headers from linux-next commit XYZ" in the iproute git commit.. Otherwise, linux-next is built, I think daily/weekly and includes the latest of both rdma and netdev next trees, so it certainly has the right content. A script could figure out the stable netdev and rdma commit IDs from linux-next and record those, if that is interest.. Jason