diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2018-03-30 21:52:33 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2018-03-30 21:52:33 +0300 |
| commit | 1f901d59a5489e4dc7fdd339808d89b89f35483e (patch) | |
| tree | a43fd6c318a8f2af763ae8186af8ecde49cad582 /tools/testing/selftests/bpf/test_tcpbpf_kern.c | |
| parent | 4df4925b1b26f285aa76f89d95db3388a2d55281 (diff) | |
| parent | 694f54f680f7fd8e9561928fbfc537d9afbc3d79 (diff) | |
| download | linux-1f901d59a5489e4dc7fdd339808d89b89f35483e.tar.xz | |
Merge airlied/drm-next into drm-intel-next-queued
Commit 'aee3bac0a3a8 ("drm/i915/psr: Tie PSR2 support to Y
coordinate requirement")' got merged to drm-intel-next-queued
but the variable was defined commit 'c5fe47327b06 ("drm: Add PSR
version 3 macro") who was merged through drm-misc.
So backmerging to get drm-intel-next-queued compiling back again.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'tools/testing/selftests/bpf/test_tcpbpf_kern.c')
| -rw-r--r-- | tools/testing/selftests/bpf/test_tcpbpf_kern.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/test_tcpbpf_kern.c b/tools/testing/selftests/bpf/test_tcpbpf_kern.c index 57119ad57a3f..3e645ee41ed5 100644 --- a/tools/testing/selftests/bpf/test_tcpbpf_kern.c +++ b/tools/testing/selftests/bpf/test_tcpbpf_kern.c @@ -5,7 +5,6 @@ #include <linux/if_ether.h> #include <linux/if_packet.h> #include <linux/ip.h> -#include <linux/in6.h> #include <linux/types.h> #include <linux/socket.h> #include <linux/tcp.h> |