diff options
| author | David Ahern <dsahern@kernel.org> | 2020-08-06 16:21:35 +0000 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2020-08-06 16:21:35 +0000 |
| commit | e572e3af0d24718cc10546609784d81530a60141 (patch) | |
| tree | cefbbaf5b3a59eb4107f3eaf0e788fc2dd31bb30 /rdma | |
| parent | 7332b188a6f8e5c5d67c9a03d1591a813a4c908c (diff) | |
| parent | 53159d81156f7fab53b97ceb4750d8b9c3c10fcc (diff) | |
| download | iproute2-e572e3af0d24718cc10546609784d81530a60141.tar.gz | |
Merge branch 'main' into next
Conflicts:
bridge/fdb.c
man/man8/bridge.8
Signed-off-by: David Ahern <dsahern@kernel.org>
Diffstat (limited to 'rdma')
| -rw-r--r-- | rdma/rdma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rdma/rdma.c b/rdma/rdma.c index c24894d6..9ea2d17f 100644 --- a/rdma/rdma.c +++ b/rdma/rdma.c @@ -5,7 +5,7 @@ */ #include "rdma.h" -#include "SNAPSHOT.h" +#include "version.h" #include "color.h" static void help(char *name) @@ -133,8 +133,8 @@ int main(int argc, char **argv) long_options, NULL)) >= 0) { switch (opt) { case 'V': - printf("%s utility, iproute2-ss%s\n", - filename, SNAPSHOT); + printf("%s utility, iproute2-%s\n", + filename, version); return EXIT_SUCCESS; case 'p': pretty = 1; |