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

31 files changed, 39 insertions, 41 deletions

diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt
index 006f47c7d913..94a987bd2bc5 100644
--- a/Documentation/trace/ftrace.txt
+++ b/Documentation/trace/ftrace.txt
@@ -1546,7 +1546,7 @@ Note, that the trace data shows the internal priority (99 - rtprio).
 
   <idle>-0       3d..3    5us :      0:120:R ==> [003]  2389: 94:R sleep
 
-The 0:120:R means idle was running with a nice priority of 0 (120 - 20)
+The 0:120:R means idle was running with a nice priority of 0 (120 - 120)
 and in the running state 'R'. The sleep task was scheduled in with
 2389: 94:R. That is the priority is the kernel rtprio (99 - 5 = 94)
 and it too is in the running state.
diff --git a/MAINTAINERS b/MAINTAINERS
index bb4c9773a83c..45b173ab0463 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10143,7 +10143,7 @@ W:	http://sourceforge.net/projects/accel-pptp
 PREEMPTIBLE KERNEL
 M:      Robert Love <rml@tech9.net>
 L:      kpreempt-tech@lists.sourceforge.net
-W:      ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
+W:      https://www.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
 S:      Supported
 F:      Documentation/preempt-locking.txt
 F:      include/linux/preempt.h
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 19df4918e37e..d545abbd5378 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -219,7 +219,7 @@ config BLK_DEV_LOOP
 
           To use the loop device, you need the losetup utility, found in the
           util-linux package, see
-          <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>.
+          <https://www.kernel.org/pub/linux/utils/util-linux/>.
 
           The loop device driver can also be used to "hide" a file system in
           a disk partition, floppy, or regular file, either using encryption
diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c
index f62041fe8412..11d4e885893a 100644
--- a/drivers/gpu/drm/sti/sti_compositor.c
+++ b/drivers/gpu/drm/sti/sti_compositor.c
@@ -89,7 +89,7 @@ static int sti_compositor_bind(struct device *dev,
                         /* Nothing to do, wait for the second round */
                         break;
                 default:
-                        DRM_ERROR("Unknow subdev compoment type\n");
+                        DRM_ERROR("Unknown subdev component type\n");
                         return 1;
                 }
         }
diff --git a/drivers/hid/hid-picolcd_debugfs.c b/drivers/hid/hid-picolcd_debugfs.c
index 3c13af684410..3e0feb4bb538 100644
--- a/drivers/hid/hid-picolcd_debugfs.c
+++ b/drivers/hid/hid-picolcd_debugfs.c
@@ -736,7 +736,7 @@ void picolcd_debug_raw_event(struct picolcd_data *data,
                 }
                 break;
         case REPORT_MEMORY:
-                /* Data buffer in response to REPORT_READ_MEMORY or REPORT_WRTIE_MEMORY */
+                /* Data buffer in response to REPORT_READ_MEMORY or REPORT_WRITE_MEMORY */
                 snprintf(buff, BUFF_SZ, "report %s (%d, size=%d)\n",
                         "REPORT_MEMORY", report->id, size-1);
                 hid_debug_event(hdev, buff);
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index 3725f088f17e..415c145c8299 100644
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -12,7 +12,7 @@
  * 1999-08-02 (jmt) - Initial rewrite for Unified ADB.
  * 2000-03-29 Tony Mantler <tonym@mac.linux-m68k.org>
  *                              - Big overhaul, should actually work now.
- * 2006-12-31 Finn Thain <fthain@telegraphics.com.au> - Another overhaul.
+ * 2006-12-31 Finn Thain - Another overhaul.
  *
  * Suggested reading:
  *   Inside Macintosh, ch. 5 ADB Manager
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index b7767da50c26..585ff3284bf5 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -115,7 +115,7 @@ config MD_RAID10
 
           RAID-10 requires mdadm-1.7.0 or later, available at:
 
-          ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/
+          https://www.kernel.org/pub/linux/utils/raid/mdadm/
 
           If unsure, say Y.
 
diff --git a/drivers/media/dvb-frontends/horus3a.c b/drivers/media/dvb-frontends/horus3a.c
index 94bb4f7a2298..68d759c4c52e 100644
--- a/drivers/media/dvb-frontends/horus3a.c
+++ b/drivers/media/dvb-frontends/horus3a.c
@@ -404,6 +404,6 @@ struct dvb_frontend *horus3a_attach(struct dvb_frontend *fe,
 }
 EXPORT_SYMBOL(horus3a_attach);
 
-MODULE_DESCRIPTION("Sony HORUS3A sattelite tuner driver");
+MODULE_DESCRIPTION("Sony HORUS3A satellite tuner driver");
 MODULE_AUTHOR("Sergey Kozlov <serjk@netup.ru>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index 463b69c934be..aa44e11decca 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -589,7 +589,7 @@ int vpu_load_firmware(struct platform_device *pdev)
                                                );
         if (ret == 0) {
                 ret = -ETIME;
-                dev_err(dev, "wait vpu initialization timout!\n");
+                dev_err(dev, "wait vpu initialization timeout!\n");
                 goto OUT_LOAD_FW;
         } else if (-ERESTARTSYS == ret) {
                 dev_err(dev, "wait vpu interrupted by a signal!\n");
diff --git a/drivers/misc/cxl/flash.c b/drivers/misc/cxl/flash.c
index c63d61e17d56..7c61c70ba3f6 100644
--- a/drivers/misc/cxl/flash.c
+++ b/drivers/misc/cxl/flash.c
@@ -343,7 +343,7 @@ static int transfer_image(struct cxl *adapter, int operation,
                         return rc;
                 }
                 if (rc == 0) {
-                        pr_devel("remove curent afu\n");
+                        pr_devel("remove current afu\n");
                         for (afu = 0; afu < adapter->slices; afu++)
                                 cxl_guest_remove_afu(adapter->afu[afu]);
 
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index f0855ce08ed9..43d131f5ae10 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -2,7 +2,7 @@ menuconfig MTD_UBI
         tristate "Enable UBI - Unsorted block images"
         select CRC32
         help
-          UBI is a software layer above MTD layer which admits of LVM-like
+          UBI is a software layer above MTD layer which admits use of LVM-like
           logical volumes on top of MTD devices, hides some complexities of
           flash chips like wear and bad blocks and provides some other useful
           capabilities. Please, consult the MTD web site for more details
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index b6fb8f945c21..8290432017ce 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -45,7 +45,7 @@
  * About minimal I/O units. In general, UBI assumes flash device model where
  * there is only one minimal I/O unit size. E.g., in case of NOR flash it is 1,
  * in case of NAND flash it is a NAND page, etc. This is reported by MTD in the
- * @ubi->mtd->writesize field. But as an exception, UBI admits of using another
+ * @ubi->mtd->writesize field. But as an exception, UBI admits use of another
  * (smaller) minimal I/O unit size for EC and VID headers to make it possible
  * to do different optimizations.
  *
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index 697dbcba7371..5fe62653995e 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -544,8 +544,7 @@ struct ubi_debug_info {
  * @vid_hdr_aloffset: starting offset of the VID header aligned to
  *                    @hdrs_min_io_size
  * @vid_hdr_shift: contains @vid_hdr_offset - @vid_hdr_aloffset
- * @bad_allowed: whether the MTD device admits of bad physical eraseblocks or
- *               not
+ * @bad_allowed: whether the MTD device admits bad physical eraseblocks or not
  * @nor_flash: non-zero if working on top of NOR flash
  * @max_write_size: maximum amount of bytes the underlying flash can write at a
  *                  time (MTD write buffer size)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index a92bf94f8e94..56a563f90b0b 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -2002,7 +2002,7 @@ static int fec_enet_mii_init(struct platform_device *pdev)
                 mii_speed--;
         if (mii_speed > 63) {
                 dev_err(&pdev->dev,
-                        "fec clock (%lu) to fast to get right mii speed\n",
+                        "fec clock (%lu) too fast to get right mii speed\n",
                         clk_get_rate(fep->clk_ipg));
                 err = -EINVAL;
                 goto err_out;
@@ -2948,7 +2948,7 @@ static void set_multicast_list(struct net_device *ndev)
                 }
 
                 /* only upper 6 bits (FEC_HASH_BITS) are used
-                 * which point to specific bit in he hash registers
+                 * which point to specific bit in the hash registers
                  */
                 hash = (crc >> (32 - FEC_HASH_BITS)) & 0x3f;
 
diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c
index a10d0e7fc5f7..3de4fe4dda77 100644
--- a/drivers/net/phy/dp83848.c
+++ b/drivers/net/phy/dp83848.c
@@ -115,5 +115,5 @@ static struct phy_driver dp83848_driver[] = {
 module_phy_driver(dp83848_driver);
 
 MODULE_DESCRIPTION("Texas Instruments DP83848 PHY driver");
-MODULE_AUTHOR("Andrew F. Davis <afd@ti.com");
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
index 3571ce4bd276..2bc6bace069c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
@@ -2111,7 +2111,7 @@ static enum version_8821ae _rtl8821ae_read_chip_version(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         "Chip Version ID: Unknow (0x%X)\n", version);
+                         "Chip Version ID: Unknown (0x%X)\n", version);
                 break;
         }
 
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 043ac9bcbccb..1482d132fbb8 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -241,7 +241,7 @@ static void amd_gpio_dbg_show(struct seq_file *s, struct gpio_chip *gc)
                                          pin_reg & BIT(ACTIVE_LEVEL_OFF + 1))
                                         active_level = "Active on both|";
                                 else
-                                        active_level = "Unknow Active level|";
+                                        active_level = "Unknown Active level|";
 
                                 if (pin_reg & BIT(LEVEL_TRIG_OFF))
                                         level_trig = "Level trigger|";
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index 14c0334f41e4..bb567d3b0693 100644
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -631,7 +631,7 @@ static void __exit mac_esp_exit(void)
 }
 
 MODULE_DESCRIPTION("Mac ESP SCSI driver");
-MODULE_AUTHOR("Finn Thain <fthain@telegraphics.com.au>");
+MODULE_AUTHOR("Finn Thain");
 MODULE_LICENSE("GPL v2");
 MODULE_VERSION(DRV_VERSION);
 MODULE_ALIAS("platform:" DRV_MODULE_NAME);
diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c
index abada16b375b..da979a73baa0 100644
--- a/drivers/scsi/snic/snic_scsi.c
+++ b/drivers/scsi/snic/snic_scsi.c
@@ -1066,7 +1066,7 @@ ioctl_hba_rst:
         if (!snic->remove_wait) {
                 spin_unlock_irqrestore(io_lock, flags);
                 SNIC_HOST_ERR(snic->shost,
-                              "reset_cmpl:host reset completed after timout\n");
+                              "reset_cmpl:host reset completed after timeout\n");
                 ret = 1;
 
                 return ret;
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index e6d1a6510886..309d25065bb6 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -3370,7 +3370,7 @@ EXPORT_SYMBOL(tty_unregister_device);
 /**
  * __tty_alloc_driver -- allocate tty driver
  * @lines: count of lines this driver can handle at most
- * @owner: module which is repsonsible for this driver
+ * @owner: module which is responsible for this driver
  * @flags: some of TTY_DRIVER_* flags, will be set in driver->flags
  *
  * This should not be called directly, some of the provided macros should be
diff --git a/fs/autofs4/Kconfig b/fs/autofs4/Kconfig
index 1204d6384d39..44727bf18297 100644
--- a/fs/autofs4/Kconfig
+++ b/fs/autofs4/Kconfig
@@ -7,7 +7,7 @@ config AUTOFS4_FS
           automounter (amd), which is a pure user space daemon.
 
           To use the automounter you need the user-space tools from
-          <ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/>; you also
+          <https://www.kernel.org/pub/linux/daemons/autofs/v4/>; you also
           want to answer Y to "NFS file system support", below.
 
           To compile this support as a module, choose M here: the module will be
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 186dd6eae958..1e590c3bd581 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -186,7 +186,7 @@ extern long io_schedule_timeout(long timeout);
 extern void io_schedule(void);
 
 /**
- * struct prev_cputime - snaphsot of system and user cputime
+ * struct prev_cputime - snapshot of system and user cputime
  * @utime: time spent in user mode
  * @stime: time spent in system mode
  * @lock: protects the above two fields
diff --git a/init/main.c b/init/main.c
index b0c11cbf5ddf..b1b9dbf7622f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -495,7 +495,7 @@ asmlinkage __visible void __init start_kernel(void)
         debug_objects_early_init();
 
         /*
-         * Set up the the initial canary ASAP:
+         * Set up the initial canary ASAP:
          */
         boot_init_stack_canary();
 
@@ -504,10 +504,10 @@ asmlinkage __visible void __init start_kernel(void)
         local_irq_disable();
         early_boot_irqs_disabled = true;
 
-/*
- * Interrupts are still disabled. Do necessary setups, then
- * enable them
- */
+        /*
+         * Interrupts are still disabled. Do necessary setups, then
+         * enable them.
+         */
         boot_cpu_init();
         page_address_init();
         pr_notice("%s", linux_banner);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index a903276fcb62..d71109321841 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -7631,7 +7631,7 @@ next_group:
 
 /**
  * check_asym_packing - Check to see if the group is packed into the
- *                      sched doman.
+ *                      sched domain.
  *
  * This is primarily intended to used at the sibling level.  Some
  * cores like POWER7 prefer to use lower numbered SMT threads.  In the
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index a7560123617c..ac053bb5296e 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -987,7 +987,7 @@ EXPORT_SYMBOL_GPL(hrtimer_start_range_ns);
  * Returns:
  *  0 when the timer was not active
  *  1 when the timer was active
- * -1 when the timer is currently excuting the callback function and
+ * -1 when the timer is currently executing the callback function and
  *    cannot be stopped
  */
 int hrtimer_try_to_cancel(struct hrtimer *timer)
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index cc6b6bdd1329..152a706ef8b8 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1120,7 +1120,7 @@ void add_timer_on(struct timer_list *timer, int cpu)
 EXPORT_SYMBOL_GPL(add_timer_on);
 
 /**
- * del_timer - deactive a timer.
+ * del_timer - deactivate a timer.
  * @timer: the timer to be deactivated
  *
  * del_timer() deactivates a timer - this works on both active and inactive
diff --git a/scripts/ksymoops/README b/scripts/ksymoops/README
index f6cb06e3f30e..413043980127 100644
--- a/scripts/ksymoops/README
+++ b/scripts/ksymoops/README
@@ -1,8 +1,7 @@
 ksymoops has been removed from the kernel.  It was always meant to be a
 free standing utility, not linked to any particular kernel version.
 The latest version can be found in
-ftp://ftp.<country>.kernel.org/pub/linux/utils/kernel/ksymoops together
-with patches to other utilities in order to give more accurate Oops
-debugging.
+https://www.kernel.org/pub/linux/utils/kernel/ksymoops together with patches to
+other utilities in order to give more accurate Oops debugging.
 
 Keith Owens <kaos@ocs.com.au> Sat Jun 19 10:30:34 EST 1999
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 3c575cd07888..676fc10c9514 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -262,8 +262,8 @@ EOF
 cat <<EOF > debian/copyright
 This is a packacked upstream version of the Linux kernel.
 
-The sources may be found at most Linux ftp sites, including:
-ftp://ftp.kernel.org/pub/linux/kernel
+The sources may be found at most Linux archive sites, including:
+https://www.kernel.org/pub/linux/kernel
 
 Copyright: 1991 - 2015 Linus Torvalds and others.
 
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)
         OPT_INCR('v', "verbose", &verbose,
                     "be more verbose (show parsed arguments, etc)"),
         OPT_BOOLEAN('q', "quiet", &params.quiet,
-                    "be quiet (do not show any mesages)"),
+                    "be quiet (do not show any messages)"),
         OPT_CALLBACK_DEFAULT('l', "list", NULL, "[GROUP:]EVENT",
                              "list up probe events",
                              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)
 
 GIT_VERSION = $(shell git describe --always --long --dirty || echo "unknown")
 
-CFLAGS := -std=gnu99 -Wall -O2 -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CURDIR)/include $(CFLAGS)
+CFLAGS := -std=gnu99 -O2 -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CURDIR)/include $(CFLAGS)
 
 export CFLAGS
 
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)
 LDFLAGS += -lrt -lpthread
 
 # these are all "safe" tests that don't modify
-# system time or require escalated privledges
+# system time or require escalated privileges
 TEST_GEN_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \
              inconsistency-check raw_skew threadtest rtctest
 
@@ -14,7 +14,7 @@ TEST_GEN_PROGS_EXTENDED = alarmtimer-suspend valid-adjtimex adjtick change_skew
 
 include ../lib.mk
 
-# these tests require escalated privledges
+# these tests require escalated privileges
 # and may modify the system time or trigger
 # other behavior like suspend
 run_destructive_tests: run_tests