diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-04 10:53:04 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-04 10:53:04 +0300 |
| commit | 649e441f49d4bfb717e9467950891dc452f4e063 (patch) | |
| tree | 2bdfdca65519db2f350c236cbbd65f24d5746cad /include/linux/flex_array.h | |
| parent | 42f930da7f00c0ab23df4c7aed36137f35988980 (diff) | |
| parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) | |
| download | linux-649e441f49d4bfb717e9467950891dc452f4e063.tar.xz | |
Merge branch 'linus' into core/urgent, to pick up dependent commits
We want to fix an objtool build warning that got introduced in the latest upstream kernel.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/flex_array.h')
| -rw-r--r-- | include/linux/flex_array.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/flex_array.h b/include/linux/flex_array.h index 11366b3ff0b4..b94fa61b51fb 100644 --- a/include/linux/flex_array.h +++ b/include/linux/flex_array.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _FLEX_ARRAY_H #define _FLEX_ARRAY_H |