diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
| commit | d2abae71ebcc409828b24ce9da402548ecdf1311 (patch) | |
| tree | 5edfafc2828d3bcebb3698520ccba374cd4328c0 /kernel/bpf/cgroup.c | |
| parent | 66567fcbaecac455caa1b13643155d686b51ce63 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/bpf/cgroup.c')
| -rw-r--r-- | kernel/bpf/cgroup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index fcde0f7b2585..92a7d0cf8d13 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c | |||
| @@ -1,11 +1,8 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* | 2 | /* |
| 2 | * Functions to manage eBPF programs attached to cgroups | 3 | * Functions to manage eBPF programs attached to cgroups |
| 3 | * | 4 | * |
| 4 | * Copyright (c) 2016 Daniel Mack | 5 | * Copyright (c) 2016 Daniel Mack |
| 5 | * | ||
| 6 | * This file is subject to the terms and conditions of version 2 of the GNU | ||
| 7 | * General Public License. See the file COPYING in the main directory of the | ||
| 8 | * Linux distribution for more details. | ||
| 9 | */ | 6 | */ |
| 10 | 7 | ||
| 11 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |