apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/trace/ftrace.txt
+1 -1
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
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.
MAINTAINERS
+1 -1
View File
@@ -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
drivers/block/Kconfig
+1 -1
View File
@@ -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
drivers/gpu/drm/sti/sti_compositor.c
+1 -1
View File
@@ -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;
}
}
drivers/hid/hid-picolcd_debugfs.c
+1 -1
View File
@@ -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);
drivers/macintosh/via-macii.c
+1 -1
View File
@@ -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
drivers/md/Kconfig
+1 -1
View File
@@ -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.
drivers/media/dvb-frontends/horus3a.c
+1 -1
View File
@@ -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");
drivers/media/platform/mtk-vpu/mtk_vpu.c
+1 -1
View File
@@ -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");
drivers/misc/cxl/flash.c
+1 -1
View File
@@ -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]);
drivers/mtd/ubi/Kconfig
+1 -1
View File
@@ -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
drivers/mtd/ubi/io.c
+1 -1
View File
@@ -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.
*
drivers/mtd/ubi/ubi.h
+1 -2
View File
@@ -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)
drivers/net/ethernet/freescale/fec_main.c
+2 -2
View File
@@ -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;
drivers/net/phy/dp83848.c
+1 -1
View File
@@ -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");
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
+1 -1
View File
@@ -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;
}
drivers/pinctrl/pinctrl-amd.c
+1 -1
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))
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|";
drivers/scsi/mac_esp.c
+1 -1
View File
@@ -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);
drivers/scsi/snic/snic_scsi.c
+1 -1
View File
@@ -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;
drivers/tty/tty_io.c
+1 -1
View File
@@ -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

Some files were not shown because too many files have changed in this diff Show More