diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-06-26 12:39:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-26 12:39:34 +0100 |
| commit | 53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 (patch) | |
| tree | cad53f42ce7a03c39a984bcdbcc42cd47f1af6f9 /kernel/bpf/map_in_map.c | |
| parent | ASoC: soc-core: don't use soc_find_component() at snd_soc_find_dai() (diff) | |
| parent | Linux 5.2-rc6 (diff) | |
| download | linux-dev-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.tar.xz linux-dev-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.zip | |
Merge tag 'v5.2-rc6' into asoc-5.3
Linux 5.2-rc6
Diffstat (limited to 'kernel/bpf/map_in_map.c')
| -rw-r--r-- | kernel/bpf/map_in_map.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/bpf/map_in_map.c b/kernel/bpf/map_in_map.c index 3dff41403583..fab4fb134547 100644 --- a/kernel/bpf/map_in_map.c +++ b/kernel/bpf/map_in_map.c @@ -1,8 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* Copyright (c) 2017 Facebook - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. */ #include <linux/slab.h> #include <linux/bpf.h> |