linux-stable/tools/bpf/bpftool
David S. Miller c0b458a946 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-04-01 19:49:34 -04:00
..
Documentation tools: bpftool: new command-line option and documentation for 'visual' 2018-03-01 18:29:49 -08:00
bash-completion tools: bpftool: add bash completion for CFG dump 2018-03-01 18:29:49 -08:00
Makefile tools: bpf: remove feature detection output 2018-03-16 09:23:46 +01:00
cfg.c tools: bpftool: generate .dot graph from CFG information 2018-03-01 18:29:49 -08:00
cfg.h tools: bpftool: detect sub-programs from the eBPF sequence 2018-03-01 18:29:48 -08:00
cgroup.c tools: bpftool: remove new lines from errors 2018-01-04 12:28:46 +01:00
common.c tools: bpftool: fix compilation with older headers 2018-03-06 22:51:00 +01:00
jit_disasm.c tools: bpftool: improve architecture detection by using ifindex 2018-01-18 01:26:15 +01:00
json_writer.c tools: bpftool: add JSON output for `bpftool prog dump xlated *` command 2017-10-24 01:25:08 +01:00
json_writer.h tools: bpftool: add JSON output for `bpftool prog dump xlated *` command 2017-10-24 01:25:08 +01:00
main.c tools: bpftool: add support for quotations in batch files 2018-03-02 09:46:41 +01:00
main.h tools: bpftool: improve architecture detection by using ifindex 2018-01-18 01:26:15 +01:00
map.c tools: bpftool: don't use hex numbers in JSON output 2018-03-24 10:38:59 -07:00
prog.c tools: bpftool: new command-line option and documentation for 'visual' 2018-03-01 18:29:49 -08:00
xlated_dumper.c bpftool: Adjust to new print_bpf_insn interface 2018-03-23 17:38:57 +01:00
xlated_dumper.h tools: bpftool: fix potential format truncation 2018-03-16 09:23:15 +01:00