diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 22:09:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 22:09:35 -0400 |
commit | 89c9fea3c8034cdb2fd745f551cde0b507fd6893 (patch) | |
tree | c20880998ad9a212c83818eb3b62eaacab45a1fa /tools | |
parent | 76f1948a79b26d5f57a5ee9941876b745c6baaea (diff) | |
parent | 6fbc8798d9461c0ff22fab9fbaddde13de815941 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
tty: fix comment for __tty_alloc_driver()
init/main: properly align the multi-line comment
init/main: Fix double "the" in comment
Fix dead URLs to ftp.kernel.org
drivers: Clean up duplicated email address
treewide: Fix typo in xml/driver-api/basics.xml
tools/testing/selftests/powerpc: remove redundant CFLAGS in Makefile: "-Wall -O2 -Wall" -> "-O2 -Wall"
selftests/timers: Spelling s/privledges/privileges/
HID: picoLCD: Spelling s/REPORT_WRTIE_MEMORY/REPORT_WRITE_MEMORY/
net: phy: dp83848: Fix Typo
UBI: Fix typos
Documentation: ftrace.txt: Correct nice value of 120 priority
net: fec: Fix typo in error msg and comment
treewide: Fix typos in printk
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/builtin-probe.c | 2 | ||||
-rw-r--r-- | tools/testing/selftests/powerpc/Makefile | 2 | ||||
-rw-r--r-- | tools/testing/selftests/timers/Makefile | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index d7360c2bda13..cf9f9e9c2fc0 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c | |||
@@ -486,7 +486,7 @@ __cmd_probe(int argc, const char **argv) | |||
486 | OPT_INCR('v', "verbose", &verbose, | 486 | OPT_INCR('v', "verbose", &verbose, |
487 | "be more verbose (show parsed arguments, etc)"), | 487 | "be more verbose (show parsed arguments, etc)"), |
488 | OPT_BOOLEAN('q', "quiet", ¶ms.quiet, | 488 | OPT_BOOLEAN('q', "quiet", ¶ms.quiet, |
489 | "be quiet (do not show any mesages)"), | 489 | "be quiet (do not show any messages)"), |
490 | OPT_CALLBACK_DEFAULT('l', "list", NULL, "[GROUP:]EVENT", | 490 | OPT_CALLBACK_DEFAULT('l', "list", NULL, "[GROUP:]EVENT", |
491 | "list up probe events", | 491 | "list up probe events", |
492 | opt_set_filter_with_command, DEFAULT_LIST_FILTER), | 492 | opt_set_filter_with_command, DEFAULT_LIST_FILTER), |
diff --git a/tools/testing/selftests/powerpc/Makefile b/tools/testing/selftests/powerpc/Makefile index bf13fc2297aa..2132ff8eb4e7 100644 --- a/tools/testing/selftests/powerpc/Makefile +++ b/tools/testing/selftests/powerpc/Makefile | |||
@@ -8,7 +8,7 @@ ifeq ($(ARCH),powerpc) | |||
8 | 8 | ||
9 | GIT_VERSION = $(shell git describe --always --long --dirty || echo "unknown") | 9 | GIT_VERSION = $(shell git describe --always --long --dirty || echo "unknown") |
10 | 10 | ||
11 | CFLAGS := -std=gnu99 -Wall -O2 -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CURDIR)/include $(CFLAGS) | 11 | CFLAGS := -std=gnu99 -O2 -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CURDIR)/include $(CFLAGS) |
12 | 12 | ||
13 | export CFLAGS | 13 | export CFLAGS |
14 | 14 | ||
diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile index b90e50c36f9f..5fa1d7e9a915 100644 --- a/tools/testing/selftests/timers/Makefile +++ b/tools/testing/selftests/timers/Makefile | |||
@@ -3,7 +3,7 @@ CFLAGS += -O3 -Wl,-no-as-needed -Wall $(BUILD_FLAGS) | |||
3 | LDFLAGS += -lrt -lpthread | 3 | LDFLAGS += -lrt -lpthread |
4 | 4 | ||
5 | # these are all "safe" tests that don't modify | 5 | # these are all "safe" tests that don't modify |
6 | # system time or require escalated privledges | 6 | # system time or require escalated privileges |
7 | TEST_GEN_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ | 7 | TEST_GEN_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ |
8 | inconsistency-check raw_skew threadtest rtctest | 8 | inconsistency-check raw_skew threadtest rtctest |
9 | 9 | ||
@@ -14,7 +14,7 @@ TEST_GEN_PROGS_EXTENDED = alarmtimer-suspend valid-adjtimex adjtick change_skew | |||
14 | 14 | ||
15 | include ../lib.mk | 15 | include ../lib.mk |
16 | 16 | ||
17 | # these tests require escalated privledges | 17 | # these tests require escalated privileges |
18 | # and may modify the system time or trigger | 18 | # and may modify the system time or trigger |
19 | # other behavior like suspend | 19 | # other behavior like suspend |
20 | run_destructive_tests: run_tests | 20 | run_destructive_tests: run_tests |