Merge branch 'iproute2-master' into iproute2-next

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

diff --cc Makefile
Simple merge

diff --cc include/json_print.h
index 25954070db27117f88d4f1e8533ff1b4ba768a45,ee087c3e627a73ffc70de465f7e94325ef824e21..dbdc90e2316ab7ed7c1ec9a133a7c069f9b15cda
--- 1/include/json_print.h
--- 2/include/json_print.h
+++ b/include/json_print.h
@@@ -64,12 -64,11 +64,12 @@@ _PRINT_FUNC(null, const char*)
  _PRINT_FUNC(string, const char*);
  _PRINT_FUNC(uint, unsigned int);
  _PRINT_FUNC(u64, uint64_t);
 +_PRINT_FUNC(hhu, unsigned char);
  _PRINT_FUNC(hu, unsigned short);
  _PRINT_FUNC(hex, unsigned int);
- _PRINT_FUNC(0xhex, unsigned long long int);
- _PRINT_FUNC(luint, unsigned long int);
- _PRINT_FUNC(lluint, unsigned long long int);
+ _PRINT_FUNC(0xhex, unsigned long long);
+ _PRINT_FUNC(luint, unsigned long);
+ _PRINT_FUNC(lluint, unsigned long long);
  _PRINT_FUNC(float, double);
  #undef _PRINT_FUNC
  

diff --cc include/json_writer.h
Simple merge

diff --cc ip/iplink_geneve.c
Simple merge

diff --cc ip/iplink_vxlan.c
Simple merge

diff --cc ip/iproute.c
Simple merge

diff --cc ip/iprule.c
Simple merge

diff --cc lib/json_print.c
Simple merge

diff --cc lib/json_writer.c
Simple merge

diff --cc lib/utils.c
Simple merge

diff --cc rdma/dev.c
Simple merge