diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-02-27 17:28:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-27 21:43:46 -0500 |
commit | 0f5e1558306076adec7255b317b89480d8aaa304 (patch) | |
tree | bb0d2d3c90a73ed3e95a55a564dcb6b0aad1c487 | |
parent | 03440c4e5e2f167764997a7e0f2dbb279d8078e6 (diff) |
scripts/spelling.txt: add "an one" pattern and fix typo instances
Fix typos and add the following to the scripts/spelling.txt:
an one||a one
I dropped the "an" before "one or more" in
drivers/net/ethernet/sfc/mcdi_pcol.h.
Link: http://lkml.kernel.org/r/1481573103-11329-6-git-send-email-yamada.masahiro@socionext.com
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/s390/kernel/vtime.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mcdi_pcol.h | 2 | ||||
-rw-r--r-- | drivers/usb/core/devio.c | 2 | ||||
-rw-r--r-- | scripts/spelling.txt | 1 | ||||
-rw-r--r-- | tools/perf/util/dso.c | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index b4a3e9e06ef2..31bd96e81167 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c | |||
@@ -350,7 +350,7 @@ static void __add_vtimer(struct vtimer_list *timer, int periodic) | |||
350 | } | 350 | } |
351 | 351 | ||
352 | /* | 352 | /* |
353 | * add_virt_timer - add an oneshot virtual CPU timer | 353 | * add_virt_timer - add a oneshot virtual CPU timer |
354 | */ | 354 | */ |
355 | void add_virt_timer(struct vtimer_list *timer) | 355 | void add_virt_timer(struct vtimer_list *timer) |
356 | { | 356 | { |
diff --git a/drivers/net/ethernet/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h index 47ced8a898ca..91fb54fd03d9 100644 --- a/drivers/net/ethernet/sfc/mcdi_pcol.h +++ b/drivers/net/ethernet/sfc/mcdi_pcol.h | |||
@@ -10832,7 +10832,7 @@ | |||
10832 | 10832 | ||
10833 | /***********************************/ | 10833 | /***********************************/ |
10834 | /* MC_CMD_GET_LICENSED_V3_FEATURE_STATES | 10834 | /* MC_CMD_GET_LICENSED_V3_FEATURE_STATES |
10835 | * Query the state of an one or more licensed features. (Note that the actual | 10835 | * Query the state of one or more licensed features. (Note that the actual |
10836 | * state may be invalidated by the MC_CMD_LICENSING_V3 OP_UPDATE_LICENSE | 10836 | * state may be invalidated by the MC_CMD_LICENSING_V3 OP_UPDATE_LICENSE |
10837 | * operation or a reboot of the MC.) Used for V3 licensing (Medford) | 10837 | * operation or a reboot of the MC.) Used for V3 licensing (Medford) |
10838 | */ | 10838 | */ |
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index 52747b6ac89a..ca425e8099ea 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c | |||
@@ -2335,7 +2335,7 @@ static int proc_drop_privileges(struct usb_dev_state *ps, void __user *arg) | |||
2335 | if (copy_from_user(&data, arg, sizeof(data))) | 2335 | if (copy_from_user(&data, arg, sizeof(data))) |
2336 | return -EFAULT; | 2336 | return -EFAULT; |
2337 | 2337 | ||
2338 | /* This is an one way operation. Once privileges are | 2338 | /* This is a one way operation. Once privileges are |
2339 | * dropped, you cannot regain them. You may however reissue | 2339 | * dropped, you cannot regain them. You may however reissue |
2340 | * this ioctl to shrink the allowed interfaces mask. | 2340 | * this ioctl to shrink the allowed interfaces mask. |
2341 | */ | 2341 | */ |
diff --git a/scripts/spelling.txt b/scripts/spelling.txt index 27991a91de6f..6ff540377fe6 100644 --- a/scripts/spelling.txt +++ b/scripts/spelling.txt | |||
@@ -89,6 +89,7 @@ amout||amount | |||
89 | an union||a union | 89 | an union||a union |
90 | an user||a user | 90 | an user||a user |
91 | an userspace||a userspace | 91 | an userspace||a userspace |
92 | an one||a one | ||
92 | analysator||analyzer | 93 | analysator||analyzer |
93 | ang||and | 94 | ang||and |
94 | anniversery||anniversary | 95 | anniversery||anniversary |
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 28d41e709128..3abe3373ce90 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c | |||
@@ -951,7 +951,7 @@ static struct dso *__dso__findlink_by_longname(struct rb_root *root, | |||
951 | if (rc == 0) { | 951 | if (rc == 0) { |
952 | /* | 952 | /* |
953 | * In case the new DSO is a duplicate of an existing | 953 | * In case the new DSO is a duplicate of an existing |
954 | * one, print an one-time warning & put the new entry | 954 | * one, print a one-time warning & put the new entry |
955 | * at the end of the list of duplicates. | 955 | * at the end of the list of duplicates. |
956 | */ | 956 | */ |
957 | if (!dso || (dso == this)) | 957 | if (!dso || (dso == this)) |