From: David Ahern <dsahern@kernel.org>
Date: Thu, 6 Aug 2020 16:21:35 +0000 (+0000)
Subject: Merge branch 'main' into next
X-Git-Tag: v5.9.0~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e572e3af0d24718cc10546609784d81530a60141;p=thirdparty%2Fiproute2.git

Merge branch 'main' into next

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

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

e572e3af0d24718cc10546609784d81530a60141
diff --cc bridge/fdb.c
index d1f8afbe2,06a2254b7..37465e460
--- a/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 b3b4ab0ca,0982faef7..8ec96c01f
--- a/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 ad05cd7cb,08c53f270..b06005763
--- a/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