hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2017-05-02 19:09:35 -07:00
parent 76f1948a79 6fbc8798d9
commit 89c9fea3c8
31 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/trace/ftrace.txt
View File

@ -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 <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 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) 2389: 94:R. That is the priority is the kernel rtprio (99 - 5 = 94)
and it too is in the running state. and it too is in the running state.

2
MAINTAINERS
View File

@ -10143,7 +10143,7 @@ W: http://sourceforge.net/projects/accel-pptp
PREEMPTIBLE KERNEL PREEMPTIBLE KERNEL
M: Robert Love <rml@tech9.net> M: Robert Love <rml@tech9.net>
L: kpreempt-tech@lists.sourceforge.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 S: Supported
F: Documentation/preempt-locking.txt F: Documentation/preempt-locking.txt
F: include/linux/preempt.h F: include/linux/preempt.h

2
drivers/block/Kconfig
View File

@ -219,7 +219,7 @@ config BLK_DEV_LOOP
To use the loop device, you need the losetup utility, found in the To use the loop device, you need the losetup utility, found in the
util-linux package, see 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 The loop device driver can also be used to "hide" a file system in
a disk partition, floppy, or regular file, either using encryption a disk partition, floppy, or regular file, either using encryption

2
drivers/gpu/drm/sti/sti_compositor.c
View File

@ -89,7 +89,7 @@ static int sti_compositor_bind(struct device *dev,
/* Nothing to do, wait for the second round */ /* Nothing to do, wait for the second round */
break; break;
default: default:
DRM_ERROR("Unknow subdev compoment type\n"); DRM_ERROR("Unknown subdev component type\n");
return 1; return 1;
} }
} }

2
drivers/hid/hid-picolcd_debugfs.c
View File

@ -736,7 +736,7 @@ void picolcd_debug_raw_event(struct picolcd_data *data,
} }
break; break;
case REPORT_MEMORY: 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", snprintf(buff, BUFF_SZ, "report %s (%d, size=%d)\n",
"REPORT_MEMORY", report->id, size-1); "REPORT_MEMORY", report->id, size-1);
hid_debug_event(hdev, buff); hid_debug_event(hdev, buff);

2
drivers/macintosh/via-macii.c
View File

@ -12,7 +12,7 @@
* 1999-08-02 (jmt) - Initial rewrite for Unified ADB. * 1999-08-02 (jmt) - Initial rewrite for Unified ADB.
* 2000-03-29 Tony Mantler <tonym@mac.linux-m68k.org> * 2000-03-29 Tony Mantler <tonym@mac.linux-m68k.org>
* - Big overhaul, should actually work now. * - 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: * Suggested reading:
* Inside Macintosh, ch. 5 ADB Manager * Inside Macintosh, ch. 5 ADB Manager

2
drivers/md/Kconfig
View File

@ -115,7 +115,7 @@ config MD_RAID10
RAID-10 requires mdadm-1.7.0 or later, available at: 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. If unsure, say Y.

2
drivers/media/dvb-frontends/horus3a.c
View File

@ -404,6 +404,6 @@ struct dvb_frontend *horus3a_attach(struct dvb_frontend *fe,
} }
EXPORT_SYMBOL(horus3a_attach); 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_AUTHOR("Sergey Kozlov <serjk@netup.ru>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/media/platform/mtk-vpu/mtk_vpu.c
View File

@ -589,7 +589,7 @@ int vpu_load_firmware(struct platform_device *pdev)
); );
if (ret == 0) { if (ret == 0) {
ret = -ETIME; ret = -ETIME;
dev_err(dev, "wait vpu initialization timout!\n"); dev_err(dev, "wait vpu initialization timeout!\n");
goto OUT_LOAD_FW; goto OUT_LOAD_FW;
} else if (-ERESTARTSYS == ret) { } else if (-ERESTARTSYS == ret) {
dev_err(dev, "wait vpu interrupted by a signal!\n"); dev_err(dev, "wait vpu interrupted by a signal!\n");

2
drivers/misc/cxl/flash.c
View File

@ -343,7 +343,7 @@ static int transfer_image(struct cxl *adapter, int operation,
return rc; return rc;
} }
if (rc == 0) { if (rc == 0) {
pr_devel("remove curent afu\n"); pr_devel("remove current afu\n");
for (afu = 0; afu < adapter->slices; afu++) for (afu = 0; afu < adapter->slices; afu++)
cxl_guest_remove_afu(adapter->afu[afu]); cxl_guest_remove_afu(adapter->afu[afu]);

2
drivers/mtd/ubi/Kconfig
View File

@ -2,7 +2,7 @@ menuconfig MTD_UBI
tristate "Enable UBI - Unsorted block images" tristate "Enable UBI - Unsorted block images"
select CRC32 select CRC32
help 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 logical volumes on top of MTD devices, hides some complexities of
flash chips like wear and bad blocks and provides some other useful flash chips like wear and bad blocks and provides some other useful
capabilities. Please, consult the MTD web site for more details capabilities. Please, consult the MTD web site for more details

2
drivers/mtd/ubi/io.c
View File

@ -45,7 +45,7 @@
* About minimal I/O units. In general, UBI assumes flash device model where * 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, * 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 * 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 * (smaller) minimal I/O unit size for EC and VID headers to make it possible
* to do different optimizations. * to do different optimizations.
* *

3
drivers/mtd/ubi/ubi.h
View File

@ -544,8 +544,7 @@ struct ubi_debug_info {
* @vid_hdr_aloffset: starting offset of the VID header aligned to * @vid_hdr_aloffset: starting offset of the VID header aligned to
* @hdrs_min_io_size * @hdrs_min_io_size
* @vid_hdr_shift: contains @vid_hdr_offset - @vid_hdr_aloffset * @vid_hdr_shift: contains @vid_hdr_offset - @vid_hdr_aloffset
* @bad_allowed: whether the MTD device admits of bad physical eraseblocks or * @bad_allowed: whether the MTD device admits bad physical eraseblocks or not
* not
* @nor_flash: non-zero if working on top of NOR flash * @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 * @max_write_size: maximum amount of bytes the underlying flash can write at a
* time (MTD write buffer size) * time (MTD write buffer size)

4
drivers/net/ethernet/freescale/fec_main.c
View File

@ -2002,7 +2002,7 @@ static int fec_enet_mii_init(struct platform_device *pdev)
mii_speed--; mii_speed--;
if (mii_speed > 63) { if (mii_speed > 63) {
dev_err(&pdev->dev, 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)); clk_get_rate(fep->clk_ipg));
err = -EINVAL; err = -EINVAL;
goto err_out; 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 /* 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; hash = (crc >> (32 - FEC_HASH_BITS)) & 0x3f;

2
drivers/net/phy/dp83848.c
View File

@ -115,5 +115,5 @@ static struct phy_driver dp83848_driver[] = {
module_phy_driver(dp83848_driver); module_phy_driver(dp83848_driver);
MODULE_DESCRIPTION("Texas Instruments DP83848 PHY 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"); MODULE_LICENSE("GPL");

2
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
View File

@ -2111,7 +2111,7 @@ static enum version_8821ae _rtl8821ae_read_chip_version(struct ieee80211_hw *hw)
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
"Chip Version ID: Unknow (0x%X)\n", version); "Chip Version ID: Unknown (0x%X)\n", version);
break; break;
} }

2
drivers/pinctrl/pinctrl-amd.c
View File

@ -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)) pin_reg & BIT(ACTIVE_LEVEL_OFF + 1))
active_level = "Active on both|"; active_level = "Active on both|";
else else
active_level = "Unknow Active level|"; active_level = "Unknown Active level|";
if (pin_reg & BIT(LEVEL_TRIG_OFF)) if (pin_reg & BIT(LEVEL_TRIG_OFF))
level_trig = "Level trigger|"; level_trig = "Level trigger|";

2
drivers/scsi/mac_esp.c
View File

@ -631,7 +631,7 @@ static void __exit mac_esp_exit(void)
} }
MODULE_DESCRIPTION("Mac ESP SCSI driver"); MODULE_DESCRIPTION("Mac ESP SCSI driver");
MODULE_AUTHOR("Finn Thain <fthain@telegraphics.com.au>"); MODULE_AUTHOR("Finn Thain");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_VERSION(DRV_VERSION); MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:" DRV_MODULE_NAME); MODULE_ALIAS("platform:" DRV_MODULE_NAME);

2
drivers/scsi/snic/snic_scsi.c
View File

@ -1066,7 +1066,7 @@ ioctl_hba_rst:
if (!snic->remove_wait) { if (!snic->remove_wait) {
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
SNIC_HOST_ERR(snic->shost, SNIC_HOST_ERR(snic->shost,
"reset_cmpl:host reset completed after timout\n"); "reset_cmpl:host reset completed after timeout\n");
ret = 1; ret = 1;
return ret; return ret;

2
drivers/tty/tty_io.c
View File

@ -3370,7 +3370,7 @@ EXPORT_SYMBOL(tty_unregister_device);
/** /**
* __tty_alloc_driver -- allocate tty driver * __tty_alloc_driver -- allocate tty driver
* @lines: count of lines this driver can handle at most * @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 * @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 * This should not be called directly, some of the provided macros should be

2
fs/autofs4/Kconfig
View File

@ -7,7 +7,7 @@ config AUTOFS4_FS
automounter (amd), which is a pure user space daemon. automounter (amd), which is a pure user space daemon.
To use the automounter you need the user-space tools from 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. want to answer Y to "NFS file system support", below.
To compile this support as a module, choose M here: the module will be To compile this support as a module, choose M here: the module will be

2
include/linux/sched.h
View File

@ -186,7 +186,7 @@ extern long io_schedule_timeout(long timeout);
extern void io_schedule(void); 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 * @utime: time spent in user mode
* @stime: time spent in system mode * @stime: time spent in system mode
* @lock: protects the above two fields * @lock: protects the above two fields

10
init/main.c
View File

@ -495,7 +495,7 @@ asmlinkage __visible void __init start_kernel(void)
debug_objects_early_init(); debug_objects_early_init();
/* /*
* Set up the the initial canary ASAP: * Set up the initial canary ASAP:
*/ */
boot_init_stack_canary(); boot_init_stack_canary();
@ -504,10 +504,10 @@ asmlinkage __visible void __init start_kernel(void)
local_irq_disable(); local_irq_disable();
early_boot_irqs_disabled = true; early_boot_irqs_disabled = true;
/* /*
* Interrupts are still disabled. Do necessary setups, then * Interrupts are still disabled. Do necessary setups, then
* enable them * enable them.
*/ */
boot_cpu_init(); boot_cpu_init();
page_address_init(); page_address_init();
pr_notice("%s", linux_banner); pr_notice("%s", linux_banner);

2
kernel/sched/fair.c
View File

@ -7631,7 +7631,7 @@ next_group:
/** /**
* check_asym_packing - Check to see if the group is packed into the * 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 * This is primarily intended to used at the sibling level. Some
* cores like POWER7 prefer to use lower numbered SMT threads. In the * cores like POWER7 prefer to use lower numbered SMT threads. In the

2
kernel/time/hrtimer.c
View File

@ -987,7 +987,7 @@ EXPORT_SYMBOL_GPL(hrtimer_start_range_ns);
* Returns: * Returns:
* 0 when the timer was not active * 0 when the timer was not active
* 1 when the timer was 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 * cannot be stopped
*/ */
int hrtimer_try_to_cancel(struct hrtimer *timer) int hrtimer_try_to_cancel(struct hrtimer *timer)

2
kernel/time/timer.c
View File

@ -1120,7 +1120,7 @@ void add_timer_on(struct timer_list *timer, int cpu)
EXPORT_SYMBOL_GPL(add_timer_on); EXPORT_SYMBOL_GPL(add_timer_on);
/** /**
* del_timer - deactive a timer. * del_timer - deactivate a timer.
* @timer: the timer to be deactivated * @timer: the timer to be deactivated
* *
* del_timer() deactivates a timer - this works on both active and inactive * del_timer() deactivates a timer - this works on both active and inactive

5
scripts/ksymoops/README
View File

@ -1,8 +1,7 @@
ksymoops has been removed from the kernel. It was always meant to be a ksymoops has been removed from the kernel. It was always meant to be a
free standing utility, not linked to any particular kernel version. free standing utility, not linked to any particular kernel version.
The latest version can be found in The latest version can be found in
ftp://ftp.<country>.kernel.org/pub/linux/utils/kernel/ksymoops together https://www.kernel.org/pub/linux/utils/kernel/ksymoops together with patches to
with patches to other utilities in order to give more accurate Oops other utilities in order to give more accurate Oops debugging.
debugging.
Keith Owens <kaos@ocs.com.au> Sat Jun 19 10:30:34 EST 1999 Keith Owens <kaos@ocs.com.au> Sat Jun 19 10:30:34 EST 1999

4
scripts/package/builddeb
View File

@ -262,8 +262,8 @@ EOF
cat <<EOF > debian/copyright cat <<EOF > debian/copyright
This is a packacked upstream version of the Linux kernel. This is a packacked upstream version of the Linux kernel.
The sources may be found at most Linux ftp sites, including: The sources may be found at most Linux archive sites, including:
ftp://ftp.kernel.org/pub/linux/kernel https://www.kernel.org/pub/linux/kernel
Copyright: 1991 - 2015 Linus Torvalds and others. Copyright: 1991 - 2015 Linus Torvalds and others.

2
tools/perf/builtin-probe.c
View File

@ -486,7 +486,7 @@ __cmd_probe(int argc, const char **argv)
OPT_INCR('v', "verbose", &verbose, OPT_INCR('v', "verbose", &verbose,
"be more verbose (show parsed arguments, etc)"), "be more verbose (show parsed arguments, etc)"),
OPT_BOOLEAN('q', "quiet", &params.quiet, 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", OPT_CALLBACK_DEFAULT('l', "list", NULL, "[GROUP:]EVENT",
"list up probe events", "list up probe events",
opt_set_filter_with_command, DEFAULT_LIST_FILTER), opt_set_filter_with_command, DEFAULT_LIST_FILTER),

2
tools/testing/selftests/powerpc/Makefile
View File

@ -8,7 +8,7 @@ ifeq ($(ARCH),powerpc)
GIT_VERSION = $(shell git describe --always --long --dirty || echo "unknown") 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 export CFLAGS

4
tools/testing/selftests/timers/Makefile
View File

@ -3,7 +3,7 @@ CFLAGS += -O3 -Wl,-no-as-needed -Wall $(BUILD_FLAGS)
LDFLAGS += -lrt -lpthread LDFLAGS += -lrt -lpthread
# these are all "safe" tests that don't modify # 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 \ TEST_GEN_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \
inconsistency-check raw_skew threadtest rtctest inconsistency-check raw_skew threadtest rtctest
@ -14,7 +14,7 @@ TEST_GEN_PROGS_EXTENDED = alarmtimer-suspend valid-adjtimex adjtick change_skew
include ../lib.mk include ../lib.mk
# these tests require escalated privledges # these tests require escalated privileges
# and may modify the system time or trigger # and may modify the system time or trigger
# other behavior like suspend # other behavior like suspend
run_destructive_tests: run_tests run_destructive_tests: run_tests