diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-06 09:14:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-06 09:14:35 +0100 |
| commit | 78987584de42742bb46eaf55517a0475bfd7f032 (patch) | |
| tree | c1a54c004cfe8cd383bec5cf254d2e053133f098 /include/uapi/linux | |
| parent | e7af7b15121ca08c31a0ab9df71a41b4c53365b4 (diff) | |
| parent | d9d04527c79f0f7d9186272866526e871ef4ac6f (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/tc_act/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild index e3969bd939e4..9611c7b6c18f 100644 --- a/include/uapi/linux/tc_act/Kbuild +++ b/include/uapi/linux/tc_act/Kbuild @@ -11,3 +11,4 @@ header-y += tc_vlan.h header-y += tc_bpf.h header-y += tc_connmark.h header-y += tc_ife.h +header-y += tc_tunnel_key.h |