Merge branch 'iproute2-master' into iproute2-next

Conflicts:
	bridge/mdb.c

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

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

diff --cc bridge/bridge.c
index e5b4c3c2198f567547184ce6363d0c9ef8786c81,48fe1c8b2ef10b90857664530a0ab902f2c208e3..7fcfe1116f6e5a204151fd468adf662ef3670550
--- 1/bridge/bridge.c
--- 2/bridge/bridge.c
+++ b/bridge/bridge.c
@@@ -200,9 -193,6 +200,9 @@@ main(int argc, char **argv
  
        _SL_ = oneline ? "\\" : "\n";
  
-       if (json)
-               check_if_color_enabled();
++      if (color && !json)
++              enable_color();
 +
        if (batch_file)
                return batch(batch_file);
  

diff --cc ip/ip.c
Simple merge

diff --cc ip/ipaddress.c
Simple merge

diff --cc ip/iplink.c
Simple merge

diff --cc lib/json_writer.c
Simple merge

diff --cc lib/utils.c
Simple merge

diff --cc man/man8/tc.8
Simple merge

diff --cc misc/ss.c
Simple merge

diff --cc tc/m_action.c
Simple merge

diff --cc tc/m_bpf.c
Simple merge

diff --cc tc/m_connmark.c
Simple merge

diff --cc tc/m_csum.c
Simple merge

diff --cc tc/m_gact.c
Simple merge

diff --cc tc/m_ife.c
Simple merge

diff --cc tc/m_mirred.c
Simple merge

diff --cc tc/m_nat.c
Simple merge

diff --cc tc/m_pedit.c
Simple merge

diff --cc tc/m_police.c
Simple merge

diff --cc tc/m_sample.c
Simple merge

diff --cc tc/m_skbedit.c
Simple merge

diff --cc tc/m_skbmod.c
Simple merge

diff --cc tc/m_tunnel_key.c
Simple merge

diff --cc tc/m_vlan.c
Simple merge

diff --cc tc/tc_util.c
Simple merge