Merge branch 'main' into next

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --cc bridge/fdb.c
Simple merge

diff --cc devlink/devlink.c
index 75182cac719f06524a9a19bda3e094c58ca9bd0a,7f83fb746fd694c56dc46f7ad5d20789e5c47356..67681492f2b4e5bfcfcd3654fd1cf7e128f0b111
--- 1/devlink/devlink.c
--- 2/devlink/devlink.c
+++ b/devlink/devlink.c
@@@ -23,10 -27,12 +27,13 @@@
  #define _LINUX_SYSINFO_H /* avoid collision with musl header */
  #include <linux/genetlink.h>
  #include <linux/devlink.h>
+ #include <linux/netlink.h>
  #include <libmnl/libmnl.h>
  #include <netinet/ether.h>
+ #include <sys/select.h>
+ #include <sys/socket.h>
  #include <sys/types.h>
 +#include <rt_names.h>
  
  #include "SNAPSHOT.h"
  #include "list.h"

diff --cc man/man8/bridge.8
Simple merge

diff --cc man/man8/tc.8
Simple merge