diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-03 05:14:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-03 05:14:21 +0300 |
| commit | ff24e4980a68d83090a02fda081741a410fe8eef (patch) | |
| tree | 4d874dfcaf2bb8c3abc2446af9447a983402c0ae /tools/bpf | |
| parent | 26f146ed971c0e4a264ce525d7a66a71ef73690d (diff) | |
| parent | ea9866793d1e925b4d320eaea409263b2a568f38 (diff) | |
| download | linux-ff24e4980a68d83090a02fda081741a410fe8eef.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three trivial overlapping conflicts.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/bpf')
| -rw-r--r-- | tools/bpf/bpftool/map.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index e951d45c0131..3ec82904ccec 100644 --- a/tools/bpf/bpftool/map.c +++ b/tools/bpf/bpftool/map.c @@ -1163,6 +1163,9 @@ static int do_create(int argc, char **argv) return -1; } NEXT_ARG(); + } else { + p_err("unknown arg %s", *argv); + return -1; } } |