]> git.ipfire.org Git - thirdparty/iproute2.git/commit
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)
commit917d913b2e792fcecc7a69ff4eb778e7e87519e4
tree6030d3c29164ea23811d20e9fb49f689538eee32
parentd0cba0d1f6590ed66f0c2b87794fe745e8142c59
parente7e0e2ce65708a06e95e5822efaf10b34835e518
Merge branch 'main' into next

Conflicts:
include/uapi/linux/virtio_ids.h

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