mirror_iproute2/rdma
David Ahern e9625d6aea Merge branch 'iproute2-master' into iproute2-next
Conflicts:
	bridge/mdb.c

Updated bridge/bridge.c per removal of check_if_color_enabled by commit
1ca4341d2c ("color: disable color when json output is requested")

Signed-off-by: David Ahern <dsahern@gmail.com>
2018-03-13 17:48:10 -07:00
..
.gitignore rdma: Add basic infrastructure for RDMA tool 2017-08-21 17:07:44 -07:00
dev.c rdma: Update device capabilities flags 2018-03-08 09:15:28 -08:00
link.c rdma: Add option to provide "-" sign for the port number 2018-02-05 17:23:52 -08:00
Makefile rdma: Add resource tracking summary 2018-02-05 17:23:52 -08:00
rdma.c rdma: Add batch command support 2018-02-22 14:44:46 -08:00
rdma.h rdma: Add resource tracking summary 2018-02-05 17:23:52 -08:00
res.c rdma: Avoid memory leak for skipper resource 2018-02-23 08:42:28 -08:00
utils.c rdma: Check return value of strdup call 2018-02-05 17:23:52 -08:00