diff options
author | David S. Miller <davem@davemloft.net> | 2018-04-25 23:04:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-04-25 23:04:22 -0400 |
commit | a9537c937c1790b62de5e2789e67c0bf439b11ea (patch) | |
tree | f258739642417d820e1683e97966a3804f323ba9 /tools/bpf | |
parent | e9350d443584f5d72483b1ae035f4527cfac7a9a (diff) | |
parent | 25eb0ea7174c6e84f21fa59dccbddd0318b17b12 (diff) | |
download | linux-stable-a9537c937c1790b62de5e2789e67c0bf439b11ea.tar.gz linux-stable-a9537c937c1790b62de5e2789e67c0bf439b11ea.tar.bz2 linux-stable-a9537c937c1790b62de5e2789e67c0bf439b11ea.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merging net into net-next to help the bpf folks avoid
some really ugly merge conflicts.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/bpf')
-rw-r--r-- | tools/bpf/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile index 1ea545965ee3..53b60ad452f5 100644 --- a/tools/bpf/Makefile +++ b/tools/bpf/Makefile @@ -76,6 +76,8 @@ $(OUTPUT)bpf_asm: $(OUTPUT)bpf_asm.o $(OUTPUT)bpf_exp.yacc.o $(OUTPUT)bpf_exp.le $(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $^ $(OUTPUT)bpf_exp.lex.c: $(OUTPUT)bpf_exp.yacc.c +$(OUTPUT)bpf_exp.yacc.o: $(OUTPUT)bpf_exp.yacc.c +$(OUTPUT)bpf_exp.lex.o: $(OUTPUT)bpf_exp.lex.c clean: bpftool_clean $(call QUIET_CLEAN, bpf-progs) |