]> git.ipfire.org Git - thirdparty/iproute2.git/commit
Merge branch 'main' into next
authorDavid Ahern <dsahern@kernel.org>
Mon, 1 Aug 2022 15:42:31 +0000 (09:42 -0600)
committerDavid Ahern <dsahern@kernel.org>
Mon, 1 Aug 2022 15:42:31 +0000 (09:42 -0600)
commit3bb2c10c649d9e2bbc62b5cf637fbc47a98dfdc2
treee86b9780c4db3036a8654bb2f38c5f0983bbb15a
parentf1d037ab4ad3d4af7b77ae4f8969d658e04b5d3f
parentf8decf82af07591833f89004e9b72cc39c1b5c52
Merge branch 'main' into next

Conflicts:
vdpa/include/uapi/linux/vdpa.h

Signed-off-by: David Ahern <dsahern@kernel.org>
bridge/fdb.c
ip/ipaddress.c