Skip to content

Commit bbf6259

Browse files
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina: "The latest advances in computer science from the trivial queue" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: xtensa: fix Kconfig typo spelling.txt: Remove some duplicate entries mtd: rawnand: oxnas: cleanup/simplify code selftests: vm: add fragment CONFIG_GUP_BENCHMARK perf: Fix opt help text for --no-bpf-event HID: logitech-dj: Fix spelling in comment bootconfig: Fix kernel message mentioning CONFIG_BOOT_CONFIG MAINTAINERS: rectify MMP SUPPORT after moving cputype.h scif: Fix spelling of EACCES printk: fix global comment lib/bitmap.c: fix spello fs: Fix missing 'bit' in comment
2 parents bf36c6b + 2a9b29b commit bbf6259

11 files changed

Lines changed: 13 additions & 17 deletions

File tree

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11702,7 +11702,7 @@ S: Odd Fixes
1170211702
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git
1170311703
F: arch/arm/boot/dts/mmp*
1170411704
F: arch/arm/mach-mmp/
11705-
F: linux/soc/mmp/
11705+
F: include/linux/soc/mmp/
1170611706

1170711707
MMP USB PHY DRIVERS
1170811708
R: Lubomir Rintel <lkundrak@v3.sk>

arch/xtensa/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ config MEMMAP_CACHEATTR
523523
2: cache bypass,
524524
4: WB cached,
525525
f: illegal.
526-
For ful MMU:
526+
For full MMU:
527527
bit 0: executable,
528528
bit 1: writable,
529529
bits 2..3:

drivers/hid/hid-logitech-dj.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ static void logi_dj_recv_queue_unknown_work(struct dj_receiver_dev *djrcv_dev)
820820
{
821821
struct dj_workitem workitem = { .type = WORKITEM_TYPE_UNKNOWN };
822822

823-
/* Rate limit queries done because of unhandeled reports to 2/sec */
823+
/* Rate limit queries done because of unhandled reports to 2/sec */
824824
if (time_before(jiffies, djrcv_dev->last_query + HZ / 2))
825825
return;
826826

drivers/mtd/nand/raw/oxnas_nand.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ static int oxnas_nand_probe(struct platform_device *pdev)
144144
if (err)
145145
goto err_cleanup_nand;
146146

147-
oxnas->chips[oxnas->nchips] = chip;
148-
++oxnas->nchips;
147+
oxnas->chips[oxnas->nchips++] = chip;
149148
}
150149

151150
/* Exit if no chips found */

fs/vboxsf/dir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static bool vboxsf_dir_emit(struct file *dir, struct dir_context *ctx)
134134
d_type = vboxsf_get_d_type(info->info.attr.mode);
135135

136136
/*
137-
* On 32 bit systems pos is 64 signed, while ino is 32 bit
137+
* On 32-bit systems pos is 64-bit signed, while ino is 32-bit
138138
* unsigned so fake_ino may overflow, check for this.
139139
*/
140140
if ((ino_t)(ctx->pos + 1) != (u64)(ctx->pos + 1)) {

include/linux/scif.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ int scif_unregister(scif_epd_t epd, off_t offset, size_t len);
657657
* the negative of one of the following errors is returned.
658658
*
659659
* Errors:
660-
* EACCESS - Attempt to write to a read-only range
660+
* EACCES - Attempt to write to a read-only range
661661
* EBADF, ENOTTY - epd is not a valid endpoint descriptor
662662
* ECONNRESET - Connection reset by peer
663663
* EINVAL - rma_flags is invalid
@@ -733,7 +733,7 @@ int scif_readfrom(scif_epd_t epd, off_t loffset, size_t len, off_t
733733
* the negative of one of the following errors is returned.
734734
*
735735
* Errors:
736-
* EACCESS - Attempt to write to a read-only range
736+
* EACCES - Attempt to write to a read-only range
737737
* EBADF, ENOTTY - epd is not a valid endpoint descriptor
738738
* ECONNRESET - Connection reset by peer
739739
* EINVAL - rma_flags is invalid
@@ -815,7 +815,7 @@ int scif_writeto(scif_epd_t epd, off_t loffset, size_t len, off_t
815815
* the negative of one of the following errors is returned.
816816
*
817817
* Errors:
818-
* EACCESS - Attempt to write to a read-only range
818+
* EACCES - Attempt to write to a read-only range
819819
* EBADF, ENOTTY - epd is not a valid endpoint descriptor
820820
* ECONNRESET - Connection reset by peer
821821
* EINVAL - rma_flags is invalid
@@ -895,7 +895,7 @@ int scif_vreadfrom(scif_epd_t epd, void *addr, size_t len, off_t roffset,
895895
* the negative of one of the following errors is returned.
896896
*
897897
* Errors:
898-
* EACCESS - Attempt to write to a read-only range
898+
* EACCES - Attempt to write to a read-only range
899899
* EBADF, ENOTTY - epd is not a valid endpoint descriptor
900900
* ECONNRESET - Connection reset by peer
901901
* EINVAL - rma_flags is invalid

init/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ static void __init setup_boot_config(const char *cmdline)
468468

469469
static int __init warn_bootconfig(char *str)
470470
{
471-
pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOTCONFIG is not set.\n");
471+
pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOT_CONFIG is not set.\n");
472472
return 0;
473473
}
474474
early_param("bootconfig", warn_bootconfig);

kernel/printk/printk_safe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* is later flushed into the main ring buffer via IRQ work.
2323
*
2424
* The alternative implementation is chosen transparently
25-
* by examinig current printk() context mask stored in @printk_context
25+
* by examining current printk() context mask stored in @printk_context
2626
* per-CPU variable.
2727
*
2828
* The implementation allows to flush the strings also from another CPU.

lib/bitmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ static inline bool end_of_region(char c)
552552
}
553553

554554
/*
555-
* The format allows commas and whitespases at the beginning
555+
* The format allows commas and whitespaces at the beginning
556556
* of the region.
557557
*/
558558
static const char *bitmap_find_region(const char *str)

scripts/spelling.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,6 @@ extenstion||extension
598598
extracter||extractor
599599
faied||failed
600600
faield||failed
601-
falied||failed
602601
faild||failed
603602
failded||failed
604603
failer||failure
@@ -795,7 +794,6 @@ interrup||interrupt
795794
interrups||interrupts
796795
interruptted||interrupted
797796
interupted||interrupted
798-
interupt||interrupt
799797
intial||initial
800798
intialisation||initialisation
801799
intialised||initialised
@@ -971,7 +969,6 @@ occurd||occurred
971969
occured||occurred
972970
occurence||occurrence
973971
occure||occurred
974-
occured||occurred
975972
occuring||occurring
976973
offser||offset
977974
offet||offset
@@ -1440,7 +1437,6 @@ udpate||update
14401437
uesd||used
14411438
uknown||unknown
14421439
usccess||success
1443-
usupported||unsupported
14441440
uncommited||uncommitted
14451441
uncompatible||incompatible
14461442
unconditionaly||unconditionally

0 commit comments

Comments
 (0)