summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/howto-pull-request.txt2
-rw-r--r--disk-utils/partx.c2
-rw-r--r--lib/sysfs.c2
-rw-r--r--libmount/src/cache.c2
-rw-r--r--libmount/src/fs.c2
-rw-r--r--libmount/src/tab.c2
-rw-r--r--libsmartcols/samples/fromfile.c2
-rw-r--r--login-utils/last.c2
-rw-r--r--misc-utils/blkid.c2
-rw-r--r--misc-utils/cal.c2
-rw-r--r--misc-utils/findmnt.c2
-rw-r--r--misc-utils/look.c2
-rw-r--r--misc-utils/lsblk.c2
-rw-r--r--misc-utils/test_uuidd.c2
-rw-r--r--misc-utils/wipefs.c2
-rw-r--r--sys-utils/chcpu.c2
-rw-r--r--sys-utils/dmesg.c2
-rw-r--r--sys-utils/fallocate.c2
-rw-r--r--sys-utils/fsfreeze.c2
-rw-r--r--sys-utils/hwclock.c4
-rw-r--r--sys-utils/mount.c2
-rw-r--r--sys-utils/swapon.c2
-rw-r--r--sys-utils/umount.c2
-rw-r--r--sys-utils/wdctl.c2
-rw-r--r--term-utils/agetty.c2
25 files changed, 26 insertions, 26 deletions
diff --git a/Documentation/howto-pull-request.txt b/Documentation/howto-pull-request.txt
index dfa397780..7cae7228b 100644
--- a/Documentation/howto-pull-request.txt
+++ b/Documentation/howto-pull-request.txt
@@ -29,7 +29,7 @@ Branches
--------
1. Use the name of the subsystem, such as blkid, libmount, misc-utils,
-that is the common thing for changes in in the change set.
+that is the common thing for changes in the change set.
2. If the changes do not have anything in common use some random name,
such as YYYY-MM-DD of the first patch in the branch. Name of the branch
diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index 7442100f3..d1964b458 100644
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -815,7 +815,7 @@ int main(int argc, char **argv)
{ NULL, 0, NULL, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'P','a','d','l','r','s','u' },
{ 0 }
};
diff --git a/lib/sysfs.c b/lib/sysfs.c
index 9c66a611a..cc290faac 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -623,7 +623,7 @@ static char *get_subsystem(char *chain, char *buf, size_t bufsz)
}
/*
- * Returns complete path to the device, the patch contains all all subsystems
+ * Returns complete path to the device, the patch contains all subsystems
* used for the device.
*/
char *sysfs_get_devchain(struct sysfs_cxt *cxt, char *buf, size_t bufsz)
diff --git a/libmount/src/cache.c b/libmount/src/cache.c
index 04dcb7fb3..6ff997140 100644
--- a/libmount/src/cache.c
+++ b/libmount/src/cache.c
@@ -85,7 +85,7 @@ struct libmnt_cache *mnt_new_cache(void)
* @cache: pointer to struct libmnt_cache instance
*
* Deallocates the cache. This function does not care about reference count. Don't
- * use this function directly -- it's better to use use mnt_unref_cache().
+ * use this function directly -- it's better to use mnt_unref_cache().
*/
void mnt_free_cache(struct libmnt_cache *cache)
{
diff --git a/libmount/src/fs.c b/libmount/src/fs.c
index d143eb5fa..1c4ba1aab 100644
--- a/libmount/src/fs.c
+++ b/libmount/src/fs.c
@@ -43,7 +43,7 @@ struct libmnt_fs *mnt_new_fs(void)
* @fs: fs pointer
*
* Deallocates the fs. This function does not care about reference count. Don't
- * use this function directly -- it's better to use use mnt_unref_fs().
+ * use this function directly -- it's better to use mnt_unref_fs().
*
* The reference counting is supported since util-linux v2.24.
*/
diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index 0eeefe76d..8cf11814f 100644
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -150,7 +150,7 @@ void mnt_unref_table(struct libmnt_table *tb)
* @tb: tab pointer
*
* Deallocates the table. This function does not care about reference count. Don't
- * use this function directly -- it's better to use use mnt_unref_table().
+ * use this function directly -- it's better to use mnt_unref_table().
*
* The table entries (filesystems) are unreferenced by mnt_reset_table() and
* cache by mnt_unref_cache().
diff --git a/libsmartcols/samples/fromfile.c b/libsmartcols/samples/fromfile.c
index a2a22a4cd..4c9fca468 100644
--- a/libsmartcols/samples/fromfile.c
+++ b/libsmartcols/samples/fromfile.c
@@ -236,7 +236,7 @@ int main(int argc, char *argv[])
{ NULL, 0, 0, 0 },
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'E', 'J', 'r' },
{ 0 }
};
diff --git a/login-utils/last.c b/login-utils/last.c
index 5ebd5e2ba..340705757 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -930,7 +930,7 @@ int main(int argc, char **argv)
{ "time-format", required_argument, NULL, OPT_TIME_FORMAT },
{ NULL, 0, NULL, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'F', OPT_TIME_FORMAT }, /* fulltime, time-format */
{ 0 }
};
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 436d34d9d..ca07e9ee7 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -649,7 +649,7 @@ int main(int argc, char **argv)
int c;
uintmax_t offset = 0, size = 0;
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'n','u' },
{ 0 }
};
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 8df397cbd..a7a5bbc78 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -284,7 +284,7 @@ int main(int argc, char **argv)
{NULL, 0, NULL, 0}
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'Y','n','y' },
{ 0 }
};
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 8017ad5d1..0de8c92a3 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1316,7 +1316,7 @@ int main(int argc, char *argv[])
{ NULL, 0, 0, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'C', 'c'}, /* [no]canonicalize */
{ 'C', 'e' }, /* nocanonicalize, evaluate */
{ 'J', 'P', 'r','x' }, /* json,pairs,raw,verify */
diff --git a/misc-utils/look.c b/misc-utils/look.c
index 58cb83b60..ae0d576dd 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -170,7 +170,7 @@ look(char *front, char *back)
int ch;
char *readp, *writep;
- /* Reformat string string to avoid doing it multiple times later. */
+ /* Reformat string to avoid doing it multiple times later. */
if (dflag) {
for (readp = writep = string; (ch = *readp++) != 0;) {
if (isalnum(ch) || isblank(ch))
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index de8dbf237..647506b40 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1696,7 +1696,7 @@ int main(int argc, char *argv[])
{ NULL, 0, 0, 0 },
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'D','O' },
{ 'I','e' },
{ 'J', 'P', 'r' },
diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
index 34bb246da..13a9880b1 100644
--- a/misc-utils/test_uuidd.c
+++ b/misc-utils/test_uuidd.c
@@ -78,7 +78,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
{
fprintf(out, "\n %s [options]\n", program_invocation_short_name);
- fprintf(out, " -p <num> number of of nprocesses (default:%zu)\n", nprocesses);
+ fprintf(out, " -p <num> number of nprocesses (default:%zu)\n", nprocesses);
fprintf(out, " -t <num> number of nthreads (default:%zu)\n", nthreads);
fprintf(out, " -o <num> number of nobjects (default:%zu)\n", nobjects);
fprintf(out, " -l <level> log level (default:%zu)\n", loglev);
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index e6c417ce7..441083a5a 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -499,7 +499,7 @@ main(int argc, char **argv)
{ NULL, 0, 0, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'a','o' },
{ 0 }
};
diff --git a/sys-utils/chcpu.c b/sys-utils/chcpu.c
index 92019a912..003cf59c9 100644
--- a/sys-utils/chcpu.c
+++ b/sys-utils/chcpu.c
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
{ NULL, 0, 0, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'c','d','e','g','p' },
{ 0 }
};
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index a608cf574..6bd4a4a89 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1261,7 +1261,7 @@ int main(int argc, char *argv[])
{ NULL, 0, NULL, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'C','D','E','c','n','r' }, /* clear,off,on,read-clear,level,raw*/
{ 'H','r' }, /* human, raw */
{ 'L','r' }, /* color, raw */
diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c
index 8cbb91c23..c8068082f 100644
--- a/sys-utils/fallocate.c
+++ b/sys-utils/fallocate.c
@@ -309,7 +309,7 @@ int main(int argc, char **argv)
{ NULL, 0, 0, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'c', 'd', 'p', 'z' },
{ 'c', 'n' },
{ 'x', 'c', 'd', 'i', 'n', 'p', 'z'},
diff --git a/sys-utils/fsfreeze.c b/sys-utils/fsfreeze.c
index d837d2f39..294c44103 100644
--- a/sys-utils/fsfreeze.c
+++ b/sys-utils/fsfreeze.c
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
{ NULL, 0, 0, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'f','u' }, /* freeze, unfreeze */
{ 0 }
};
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 059ee4099..6de09fda8 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -652,7 +652,7 @@ display_time(const bool hclock_valid, struct timeval hwctime)
* runnable by issuing the command "date" to the /bin/sh shell. That means
* in must be in the current PATH.
*
- * If anything goes wrong (and many things can), we return return code 10
+ * If anything goes wrong (and many things can), we return code 10
* and arbitrary *time_p. Otherwise, return code is 0 and *time_p is valid.
*/
static int interpret_date_string(const struct hwclock_control *ctl,
@@ -1527,7 +1527,7 @@ int main(int argc, char **argv)
{NULL, 0, NULL, 0}
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'a','r','s','w',
OPT_GET, OPT_GETEPOCH, OPT_PREDICT_HC,
OPT_SET, OPT_SETEPOCH, OPT_SYSTZ },
diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index b45de78ed..0b55500f2 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -868,7 +868,7 @@ int main(int argc, char **argv)
{ NULL, 0, 0, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'B','M','R' }, /* bind,move,rbind */
{ 'L','U', MOUNT_OPT_SOURCE }, /* label,uuid,source */
{ 0 }
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 0bf95a5cc..0982093d5 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -862,7 +862,7 @@ int main(int argc, char *argv[])
{ NULL, 0, 0, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'a','o','s', SHOW_OPTION },
{ 'a','o', BYTES_OPTION },
{ 'a','o', NOHEADINGS_OPTION },
diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index d502124ed..640e2cd0d 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -527,7 +527,7 @@ int main(int argc, char **argv)
{ NULL, 0, 0, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'A','a' }, /* all-targets,all */
{ 'R','a' }, /* recursive,all */
{ 'O','R','t'}, /* options,recursive,types */
diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c
index 49711f0cf..441b7abf9 100644
--- a/sys-utils/wdctl.c
+++ b/sys-utils/wdctl.c
@@ -495,7 +495,7 @@ int main(int argc, char *argv[])
{ NULL, 0, NULL, 0 }
};
- static const ul_excl_t excl[] = { /* rows and cols in in ASCII order */
+ static const ul_excl_t excl[] = { /* rows and cols in ASCII order */
{ 'F','f' }, /* noflags,flags*/
{ 0 }
};
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index a2d367bac..830128e84 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -2537,7 +2537,7 @@ static void init_special_char(char* arg, struct options *op)
}
/*
- * Appends @str to @dest and if @dest is not empty then use use @sep as a
+ * Appends @str to @dest and if @dest is not empty then use @sep as a
* separator. The maximal final length of the @dest is @len.
*
* Returns the final @dest length or -1 in case of error.