diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-07 18:11:56 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-07 18:11:56 -0800 |
| commit | 0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch) | |
| tree | f0aa64e956d1d2addb2263ddcd238e9f014b36a0 /tools/accounting | |
| parent | 4e974c120039e35b90d2cb0459452bd9a6a71594 (diff) | |
| parent | 39dae59d66acd86d1de24294bd2f343fd5e7a625 (diff) | |
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.
Diffstat (limited to 'tools/accounting')
| -rw-r--r-- | tools/accounting/Makefile | 1 | ||||
| -rw-r--r-- | tools/accounting/getdelays.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/accounting/Makefile b/tools/accounting/Makefile index 647c94a219bf..03687f19cbb1 100644 --- a/tools/accounting/Makefile +++ b/tools/accounting/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 CC := $(CROSS_COMPILE)gcc CFLAGS := -I../../usr/include diff --git a/tools/accounting/getdelays.c b/tools/accounting/getdelays.c index b5ca536e56a8..9f420d98b5fb 100644 --- a/tools/accounting/getdelays.c +++ b/tools/accounting/getdelays.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* getdelays.c * * Utility to get per-pid and per-tgid delay accounting statistics |