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

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

author	David Ahern <dsahern@gmail.com>
	Fri, 21 Sep 2018 00:50:55 +0000 (17:50 -0700)
committer	David Ahern <dsahern@gmail.com>
	Fri, 21 Sep 2018 00:53:27 +0000 (17:53 -0700)
commit	34212c73b7758637fffb58d09367eb9d5e735a12
tree	50b3ce1afffbb536017007adbd6b27817c591b36	tree
parent	b555ff737a7031248c40a9b5a879ba8c20f836de	commit \| diff
parent	d090fbf33bd15d82978596920b07616aa119ac2f	commit \| diff

Merge branch 'iproute2-master' into iproute2-next

Conflicts:
ip/iproute_lwtunnel.c

In addition to merge conflict between bd59e5b1517b and 94a8722f2f78,
updated the code added by the latter commit based on the change of the
former (ie., added ret = to the new rta_addattr_l).

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

ip/iproute_lwtunnel.c	diff1 \|	diff2 \|	blob \| history
lib/utils.c	diff1 \|	diff2 \|	blob \| history

Upstream mirror of iproute2

RSS Atom

ip/iproute_lwtunnel.c	diff1 \|	diff2 \|	blob \| history
lib/utils.c	diff1 \|	diff2 \|	blob \| history