]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'rdma-resource-tracking' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Fri, 18 May 2018 16:21:42 +0000 (09:21 -0700)
committerDavid Ahern <dsahern@gmail.com>
Fri, 18 May 2018 16:21:42 +0000 (09:21 -0700)
Steve Wise  says:

====================

This series enhances the iproute2 rdma tool to include displaying
driver-specific resource attributes.  It is the user-space part of the
kernel driver resource tracking series that has been accepted for merging
into linux-4.18 [1]

If there are no additional review comments, it can now be merged, I think.

Changes since v2:
- resync rdma_netlink.h to fix uapi break

Changes since v1:
- commit log editorial fixes
- cite kernel commits that updated rdma_netlink.h in the
  iproute2 commit syncing this header
- reorder stack definitions ala "reverse christmas tree"
- correctly handle unknown driver attributes when printing

Changes since v0/rfc:
- changed "provider" to "driver" based on kernel side changes
- updated man pages
- removed "RFC" tag

Thanks,

Steve.

[1] https://www.spinics.net/lists/linux-rdma/msg64199.html

====================

Signed-off-by: David Ahern <dsahern@gmail.com>

Trivial merge