]> git.proxmox.com Git - mirror_iproute2.git/commit
Merge branch 'main' into next
authorDavid Ahern <dsahern@kernel.org>
Thu, 6 Aug 2020 16:21:35 +0000 (16:21 +0000)
committerDavid Ahern <dsahern@kernel.org>
Thu, 6 Aug 2020 16:21:35 +0000 (16:21 +0000)
commite572e3af0d24718cc10546609784d81530a60141
treecefbbaf5b3a59eb4107f3eaf0e788fc2dd31bb30
parent7332b188a6f8e5c5d67c9a03d1591a813a4c908c
parent53159d81156f7fab53b97ceb4750d8b9c3c10fcc
Merge branch 'main' into next

Conflicts:
bridge/fdb.c
man/man8/bridge.8

Signed-off-by: David Ahern <dsahern@kernel.org>
bridge/fdb.c
devlink/devlink.c
man/man8/bridge.8
misc/ss.c
rdma/rdma.c