Merge branch 'main' into next

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

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

diff --cc bridge/fdb.c
index d1f8afbe2ec2af487af8074410d9931ecdb4b783,06a2254b7de3443d340963d3a238de73ae14723b..37465e460f08eff5b45e588159f8299ea1000b0a
--- 1/bridge/fdb.c
--- 2/bridge/fdb.c
+++ b/bridge/fdb.c
@@@ -37,12 -38,13 +38,13 @@@ static void usage(void
        fprintf(stderr,
                "Usage: bridge fdb { add | append | del | replace } ADDR dev DEV\n"
                "              [ self ] [ master ] [ use ] [ router ] [ extern_learn ]\n"
 -              "              [ sticky ] [ local | static | dynamic ] [ dst IPADDR ]\n"
 -              "              [ vlan VID ] [ port PORT] [ vni VNI ] [ via DEV ]\n"
 -              "              [ src_vni VNI ]\n"
 +              "              [ sticky ] [ local | static | dynamic ] [ vlan VID ]\n"
 +              "              { [ dst IPADDR ] [ port PORT] [ vni VNI ] | [ nhid NHID ] }\n"
 +              "              [ via DEV ] [ src_vni VNI ]\n"
-               "       bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ] [ state STATE ] ]\n"
-               "       bridge fdb get ADDR [ br BRDEV ] { brport |dev }  DEV [ vlan VID ]\n"
-               "              [ vni VNI ]\n");
+               "       bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ]\n"
+               "              [ state STATE ] [ dynamic ] ]\n"
+               "       bridge fdb get [ to ] LLADDR [ br BRDEV ] { brport | dev } DEV\n"
+               "              [ vlan VID ] [ vni VNI ] [ self ] [ master ] [ dynamic ]\n");
        exit(-1);
  }
  

diff --cc devlink/devlink.c
index b3b4ab0ca1743282e5f6924e2422ca4d10d70b04,0982faef7d88eef07e1d2ff79035a492d62d7662..8ec96c01fbcf92b1de51d9cda67451f34dbadbd6
--- 1/devlink/devlink.c
--- 2/devlink/devlink.c
+++ b/devlink/devlink.c
@@@ -33,9 -33,8 +33,9 @@@
  #include <sys/select.h>
  #include <sys/socket.h>
  #include <sys/types.h>
 +#include <rt_names.h>
  
- #include "SNAPSHOT.h"
+ #include "version.h"
  #include "list.h"
  #include "mnlg.h"
  #include "json_print.h"

diff --cc man/man8/bridge.8
index ad05cd7cbcf9e233cdf5de09a42f992f8fd1062d,08c53f2706e64d2c2d94cb4b9c46664ac73b5e2d..b06005763bc2618d80374dc333dea23f2a9583e1
--- 1/man/man8/bridge.8
--- 2/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@@ -76,14 -76,12 +76,12 @@@ bridge \- show / manipulate bridge addr
  .B port
  .IR PORT " ] ["
  .B via
 -.IR DEVICE " ] ["
 -.B src_vni
 -.IR VNI " ]"
 +.IR DEVICE " ] | "
 +.B nhid
 +.IR NHID " } "
  
  .ti -8
- .BR "bridge fdb" " [ " show " ] [ "
- .B dev
- .IR DEV " ] [ "
+ .BR "bridge fdb" " [ [ " show " ] [ "
  .B br
  .IR BRDEV " ] [ "
  .B brport

diff --cc misc/ss.c
Simple merge

diff --cc rdma/rdma.c
Simple merge