]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
projects / thirdparty / iproute2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0431e1e 92e32f7)
Merge branch 'main' into next
authorDavid Ahern <dsahern@gmail.com>
Tue, 14 Sep 2021 16:46:48 +0000 (10:46 -0600)
committerDavid Ahern <dsahern@gmail.com>
Tue, 14 Sep 2021 16:46:48 +0000 (10:46 -0600)
Conflicts:
include/uapi/linux/virtio_ids.h

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

Trivial merge
Mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git