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 /usr | |
| parent | be96b316deff35e119760982c43af74e606fa143 (diff) | |
| parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) | |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/Kconfig | 1 | ||||
| -rw-r--r-- | usr/Makefile | 1 | ||||
| -rw-r--r-- | usr/gen_init_cpio.c | 1 | ||||
| -rw-r--r-- | usr/initramfs_data.S | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/usr/Kconfig b/usr/Kconfig index d53112fdbf5a..43658b8a975e 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Configuration for initramfs # diff --git a/usr/Makefile b/usr/Makefile index 0b87e71c00fc..34a9fcd0f537 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # kbuild file for usr/ - including initramfs image # diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index 225ad244cf88..03b21189d58b 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <stdio.h> #include <stdlib.h> #include <sys/types.h> diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index c14322d1c0cf..10d325e24566 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* initramfs_data includes the compressed binary that is the filesystem used for early user space. |