git.proxmox.com Git - mirror_iproute2.git/commit

]> git.proxmox.com Git - mirror_iproute2.git/commit

author	David Ahern <dsahern@gmail.com>
	Wed, 14 Mar 2018 00:48:10 +0000 (17:48 -0700)
committer	David Ahern <dsahern@gmail.com>
	Wed, 14 Mar 2018 00:48:10 +0000 (17:48 -0700)
commit	e9625d6aead11c7ca8b64af3ad06ea451e06ea9e
tree	f2736bbf90ddc7b633195385904bd4e3dde8ef52	tree
parent	a121129df91104ade8f51ac9ccd6e3a84bbddf27	commit \| diff
parent	527f85141c9e6982f73f043f85949eaf7ff498bc	commit \| diff

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>

24 files changed:

bridge/bridge.c	diff1 \|	diff2 \|	blob \| history
ip/ip.c	diff1 \|	diff2 \|	blob \| history
ip/ipaddress.c	diff1 \|	diff2 \|	blob \| history
ip/iplink.c	diff1 \|	diff2 \|	blob \| history
lib/json_writer.c	diff1 \|	diff2 \|	blob \| history
lib/utils.c	diff1 \|	diff2 \|	blob \| history
man/man8/tc.8	diff1 \|	diff2 \|	blob \| history
misc/ss.c	diff1 \|	diff2 \|	blob \| history
tc/m_action.c	diff1 \|	diff2 \|	blob \| history
tc/m_bpf.c	diff1 \|	diff2 \|	blob \| history
tc/m_connmark.c	diff1 \|	diff2 \|	blob \| history
tc/m_csum.c	diff1 \|	diff2 \|	blob \| history
tc/m_gact.c	diff1 \|	diff2 \|	blob \| history
tc/m_ife.c	diff1 \|	diff2 \|	blob \| history
tc/m_mirred.c	diff1 \|	diff2 \|	blob \| history
tc/m_nat.c	diff1 \|	diff2 \|	blob \| history
tc/m_pedit.c	diff1 \|	diff2 \|	blob \| history
tc/m_police.c	diff1 \|	diff2 \|	blob \| history
tc/m_sample.c	diff1 \|	diff2 \|	blob \| history
tc/m_skbedit.c	diff1 \|	diff2 \|	blob \| history
tc/m_skbmod.c	diff1 \|	diff2 \|	blob \| history
tc/m_tunnel_key.c	diff1 \|	diff2 \|	blob \| history
tc/m_vlan.c	diff1 \|	diff2 \|	blob \| history
tc/tc_util.c	diff1 \|	diff2 \|	blob \| history

Upstream mirror of iproute2

RSS Atom

bridge/bridge.c	diff1 \|	diff2 \|	blob \| history
ip/ip.c	diff1 \|	diff2 \|	blob \| history
ip/ipaddress.c	diff1 \|	diff2 \|	blob \| history
ip/iplink.c	diff1 \|	diff2 \|	blob \| history
lib/json_writer.c	diff1 \|	diff2 \|	blob \| history
lib/utils.c	diff1 \|	diff2 \|	blob \| history
man/man8/tc.8	diff1 \|	diff2 \|	blob \| history
misc/ss.c	diff1 \|	diff2 \|	blob \| history
tc/m_action.c	diff1 \|	diff2 \|	blob \| history
tc/m_bpf.c	diff1 \|	diff2 \|	blob \| history
tc/m_connmark.c	diff1 \|	diff2 \|	blob \| history
tc/m_csum.c	diff1 \|	diff2 \|	blob \| history
tc/m_gact.c	diff1 \|	diff2 \|	blob \| history
tc/m_ife.c	diff1 \|	diff2 \|	blob \| history
tc/m_mirred.c	diff1 \|	diff2 \|	blob \| history
tc/m_nat.c	diff1 \|	diff2 \|	blob \| history
tc/m_pedit.c	diff1 \|	diff2 \|	blob \| history
tc/m_police.c	diff1 \|	diff2 \|	blob \| history
tc/m_sample.c	diff1 \|	diff2 \|	blob \| history
tc/m_skbedit.c	diff1 \|	diff2 \|	blob \| history
tc/m_skbmod.c	diff1 \|	diff2 \|	blob \| history
tc/m_tunnel_key.c	diff1 \|	diff2 \|	blob \| history
tc/m_vlan.c	diff1 \|	diff2 \|	blob \| history
tc/tc_util.c	diff1 \|	diff2 \|	blob \| history