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

+1 -1

MAINTAINERS

··· 11702 11702 T: git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git 11703 11703 F: arch/arm/boot/dts/mmp* 11704 11704 F: arch/arm/mach-mmp/ 11705 - F: linux/soc/mmp/ 11705 + F: include/linux/soc/mmp/ 11706 11706 11707 11707 MMP USB PHY DRIVERS 11708 11708 R: Lubomir Rintel <lkundrak@v3.sk>

+1 -1

arch/xtensa/Kconfig

··· 523 523 2: cache bypass, 524 524 4: WB cached, 525 525 f: illegal. 526 - For ful MMU: 526 + For full MMU: 527 527 bit 0: executable, 528 528 bit 1: writable, 529 529 bits 2..3:

+1 -1

drivers/hid/hid-logitech-dj.c

··· 820 820 { 821 821 struct dj_workitem workitem = { .type = WORKITEM_TYPE_UNKNOWN }; 822 822 823 - /* Rate limit queries done because of unhandeled reports to 2/sec */ 823 + /* Rate limit queries done because of unhandled reports to 2/sec */ 824 824 if (time_before(jiffies, djrcv_dev->last_query + HZ / 2)) 825 825 return; 826 826

+1 -2

drivers/mtd/nand/raw/oxnas_nand.c

··· 144 144 if (err) 145 145 goto err_cleanup_nand; 146 146 147 - oxnas->chips[oxnas->nchips] = chip; 148 - ++oxnas->nchips; 147 + oxnas->chips[oxnas->nchips++] = chip; 149 148 } 150 149 151 150 /* Exit if no chips found */

+1 -1

fs/vboxsf/dir.c

··· 134 134 d_type = vboxsf_get_d_type(info->info.attr.mode); 135 135 136 136 /* 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 138 138 * unsigned so fake_ino may overflow, check for this. 139 139 */ 140 140 if ((ino_t)(ctx->pos + 1) != (u64)(ctx->pos + 1)) {

+4 -4

include/linux/scif.h

··· 657 657 * the negative of one of the following errors is returned. 658 658 * 659 659 * Errors: 660 - * EACCESS - Attempt to write to a read-only range 660 + * EACCES - Attempt to write to a read-only range 661 661 * EBADF, ENOTTY - epd is not a valid endpoint descriptor 662 662 * ECONNRESET - Connection reset by peer 663 663 * EINVAL - rma_flags is invalid ··· 733 733 * the negative of one of the following errors is returned. 734 734 * 735 735 * Errors: 736 - * EACCESS - Attempt to write to a read-only range 736 + * EACCES - Attempt to write to a read-only range 737 737 * EBADF, ENOTTY - epd is not a valid endpoint descriptor 738 738 * ECONNRESET - Connection reset by peer 739 739 * EINVAL - rma_flags is invalid ··· 815 815 * the negative of one of the following errors is returned. 816 816 * 817 817 * Errors: 818 - * EACCESS - Attempt to write to a read-only range 818 + * EACCES - Attempt to write to a read-only range 819 819 * EBADF, ENOTTY - epd is not a valid endpoint descriptor 820 820 * ECONNRESET - Connection reset by peer 821 821 * EINVAL - rma_flags is invalid ··· 895 895 * the negative of one of the following errors is returned. 896 896 * 897 897 * Errors: 898 - * EACCESS - Attempt to write to a read-only range 898 + * EACCES - Attempt to write to a read-only range 899 899 * EBADF, ENOTTY - epd is not a valid endpoint descriptor 900 900 * ECONNRESET - Connection reset by peer 901 901 * EINVAL - rma_flags is invalid

+1 -1

init/main.c

··· 468 468 469 469 static int __init warn_bootconfig(char *str) 470 470 { 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"); 472 472 return 0; 473 473 } 474 474 early_param("bootconfig", warn_bootconfig);

+1 -1

kernel/printk/printk_safe.c

··· 22 22 * is later flushed into the main ring buffer via IRQ work. 23 23 * 24 24 * 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 26 26 * per-CPU variable. 27 27 * 28 28 * The implementation allows to flush the strings also from another CPU.

+1 -1

lib/bitmap.c

··· 552 552 } 553 553 554 554 /* 555 - * The format allows commas and whitespases at the beginning 555 + * The format allows commas and whitespaces at the beginning 556 556 * of the region. 557 557 */ 558 558 static const char *bitmap_find_region(const char *str)

-4

scripts/spelling.txt

··· 598 598 extracter||extractor 599 599 faied||failed 600 600 faield||failed 601 - falied||failed 602 601 faild||failed 603 602 failded||failed 604 603 failer||failure ··· 794 795 interrups||interrupts 795 796 interruptted||interrupted 796 797 interupted||interrupted 797 - interupt||interrupt 798 798 intial||initial 799 799 intialisation||initialisation 800 800 intialised||initialised ··· 969 971 occured||occurred 970 972 occurence||occurrence 971 973 occure||occurred 972 - occured||occurred 973 974 occuring||occurring 974 975 offser||offset 975 976 offet||offset ··· 1437 1440 uesd||used 1438 1441 uknown||unknown 1439 1442 usccess||success 1440 - usupported||unsupported 1441 1443 uncommited||uncommitted 1442 1444 uncompatible||incompatible 1443 1445 unconditionaly||unconditionally

+1

tools/testing/selftests/vm/config

··· 3 3 CONFIG_TEST_VMALLOC=m 4 4 CONFIG_DEVICE_PRIVATE=y 5 5 CONFIG_TEST_HMM=m 6 + CONFIG_GUP_BENCHMARK=y