diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-09 22:04:37 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-09 22:04:37 +0300 |
| commit | 14684b93019a2d2ece0df5acaf921924541b928d (patch) | |
| tree | 29cf04da2f22b85b6051b47b3731e91a43d4c94d /samples/bpf | |
| parent | 92da362c07d413786ab59db1665376fb63805586 (diff) | |
| parent | 0058b0a506e40d9a2c62015fe92eb64a44d78cd9 (diff) | |
| download | linux-14684b93019a2d2ece0df5acaf921924541b928d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
One conflict in the BPF samples Makefile, some fixes in 'net' whilst
we were converting over to Makefile.target rules in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples/bpf')
| -rw-r--r-- | samples/bpf/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 4df11ddb9c75..d88c01275239 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -186,6 +186,7 @@ TPROGS_CFLAGS += -I$(srctree)/tools/testing/selftests/bpf/ TPROGS_CFLAGS += -I$(srctree)/tools/lib/ TPROGS_CFLAGS += -I$(srctree)/tools/include TPROGS_CFLAGS += -I$(srctree)/tools/perf +TPROGS_CFLAGS += -DHAVE_ATTR_TEST=0 ifdef SYSROOT TPROGS_CFLAGS += --sysroot=$(SYSROOT) |