From: David Ahern <dsahern@kernel.org>
Date: Sat, 9 Oct 2021 23:47:47 +0000 (-0600)
Subject: Merge branch 'main' into next
X-Git-Tag: v5.16.0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cd517a8051e4806a72ca9de2cb20a59d550fd3f;p=thirdparty%2Fiproute2.git

Merge branch 'main' into next

Conflicts:
	ip/ipneigh.c

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

8cd517a8051e4806a72ca9de2cb20a59d550fd3f
diff --cc ip/ipneigh.c
index c29325e14,4db776d75..9c20d4ad9
--- a/ip/ipneigh.c
+++ b/ip/ipneigh.c
@@@ -50,12 -50,13 +50,12 @@@ static void usage(void
  {
  	fprintf(stderr,
  		"Usage: ip neigh { add | del | change | replace }\n"
- 		"		{ ADDR [ lladdr LLADDR ] [ nud STATE ] proxy ADDR }\n"
- 		"		[ dev DEV ] [ router ] [ extern_learn ] [ protocol PROTO ]\n"
+ 		"                { ADDR [ lladdr LLADDR ] [ nud STATE ] proxy ADDR }\n"
+ 		"                [ dev DEV ] [ router ] [ extern_learn ] [ protocol PROTO ]\n"
  		"\n"
 -		"       ip neigh { show | flush } [ proxy ] [ to PREFIX ] [ dev DEV ] [ nud STATE ]\n"
 -		"                                 [ vrf NAME ]\n"
 -		"\n"
 -		"       ip neigh get { ADDR | proxy ADDR } dev DEV\n"
 +		"	ip neigh { show | flush } [ proxy ] [ to PREFIX ] [ dev DEV ] [ nud STATE ]\n"
 +		"				  [ vrf NAME ] [ nomaster ]\n"
 +		"	ip neigh get { ADDR | proxy ADDR } dev DEV\n"
  		"\n"
  		"STATE := { delay | failed | incomplete | noarp | none |\n"
  		"           permanent | probe | reachable | stale }\n");