]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8fd4d4 09c6a3d)
Merge branch 'main' into next
authorDavid Ahern <dsahern@kernel.org>
Mon, 28 Feb 2022 01:25:02 +0000 (18:25 -0700)
committerDavid Ahern <dsahern@kernel.org>
Mon, 28 Feb 2022 01:25:02 +0000 (18:25 -0700)
Signed-off-by: David Ahern <dsahern@kernel.org>
1  2 
ip/iplink_can.c patch | diff1 | diff2 | blob | history
tc/tc_util.c patch | diff1 | diff2 | blob | history

diff --cc ip/iplink_can.c
Simple merge
diff --cc tc/tc_util.c
Simple merge
Mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git