Merge git://git.kernel.org/pub/scm/network/iproute2/iproute2-next

diff --cc dcb/Makefile
index 7c09bb4f2e0084a8c748d5946d0cde28c5a3e172,02d5d044cf095749e9ec445a974a1cbade5fe390..3a2e5d4c4c0da2ae44625364ea2f2b76c1de2703
--- 1/dcb/Makefile
--- 2/dcb/Makefile
+++ b/dcb/Makefile
@@@ -5,9 -5,14 +5,15 @@@ TARGETS :
  
  ifeq ($(HAVE_MNL),y)
  
- DCBOBJ = dcb.o dcb_buffer.o dcb_ets.o dcb_maxrate.o dcb_pfc.o
+ DCBOBJ = dcb.o \
+          dcb_app.o \
+          dcb_buffer.o \
+          dcb_dcbx.o \
+          dcb_ets.o \
+          dcb_maxrate.o \
+          dcb_pfc.o
  TARGETS += dcb
 +LDLIBS += -lm
  
  endif
  

diff --cc ip/iproute.c
Simple merge

diff --cc lib/utils.c
Simple merge

diff --cc misc/ss.c
Simple merge

diff --cc rdma/rdma.h
Simple merge

diff --cc rdma/utils.c
Simple merge