]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e54ed38 4357f5c)
Merge branch 'master' into net-next
authorStephen Hemminger <stephen@networkplumber.org>
Wed, 1 Nov 2017 21:15:00 +0000 (22:15 +0100)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 1 Nov 2017 21:15:00 +0000 (22:15 +0100)
1  2 
ip/ipnetns.c patch | diff1 | diff2 | blob | history
misc/ss.c patch | diff1 | diff2 | blob | history

diff --cc ip/ipnetns.c
Simple merge
diff --cc misc/ss.c
Simple merge
Mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git