diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
| commit | 294cbd05e32990c3b1a62be27441fc719edebbab (patch) | |
| tree | 9e543bcfdaa183343f18714a256d3fd5c88d3b5c /kernel/livepatch | |
| parent | be96b316deff35e119760982c43af74e606fa143 (diff) | |
| parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) | |
| download | cachepc-linux-294cbd05e32990c3b1a62be27441fc719edebbab.tar.gz cachepc-linux-294cbd05e32990c3b1a62be27441fc719edebbab.zip | |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/livepatch')
| -rw-r--r-- | kernel/livepatch/core.h | 1 | ||||
| -rw-r--r-- | kernel/livepatch/patch.h | 1 | ||||
| -rw-r--r-- | kernel/livepatch/transition.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/kernel/livepatch/core.h b/kernel/livepatch/core.h index c74f24c47837..a351601d7f76 100644 --- a/kernel/livepatch/core.h +++ b/kernel/livepatch/core.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _LIVEPATCH_CORE_H #define _LIVEPATCH_CORE_H diff --git a/kernel/livepatch/patch.h b/kernel/livepatch/patch.h index 0db227170c36..e72d8250d04b 100644 --- a/kernel/livepatch/patch.h +++ b/kernel/livepatch/patch.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _LIVEPATCH_PATCH_H #define _LIVEPATCH_PATCH_H diff --git a/kernel/livepatch/transition.h b/kernel/livepatch/transition.h index ce09b326546c..0f6e27c481f9 100644 --- a/kernel/livepatch/transition.h +++ b/kernel/livepatch/transition.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _LIVEPATCH_TRANSITION_H #define _LIVEPATCH_TRANSITION_H |