]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Merge branch 'main' into next
authorDavid Ahern <dsahern@kernel.org>
Wed, 8 Sep 2021 21:13:49 +0000 (15:13 -0600)
committerDavid Ahern <dsahern@kernel.org>
Wed, 8 Sep 2021 21:13:49 +0000 (15:13 -0600)
Conflicts:
include/uapi/linux/virtio_ids.h

Signed-off-by: David Ahern <dsahern@kernel.org>
1  2 
man/man8/bridge.8
man/man8/ip-link.8.in

Simple merge
Simple merge