Merge branch 'main' into next

Conflicts:
	ip/ipneigh.c

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

diff --cc ip/ipneigh.c
index c29325e147bd31b9ecb91a2b6c5128b00dbf1ebc,4db776d75f757a535e8fad22230afc232fad9dc0..9c20d4ad92fb87f3ecd3ccebb8cd0e8178b5ba21
--- 1/ip/ipneigh.c
--- 2/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");

diff --cc ip/iproute.c
Simple merge

diff --cc lib/bpf_legacy.c
Simple merge