Commit bbf62599 authored by Linus Torvalds's avatar Linus Torvalds

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
parents bf36c6b9 2a9b29b2
...@@ -11702,7 +11702,7 @@ S: Odd Fixes ...@@ -11702,7 +11702,7 @@ S: Odd Fixes
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git
F: arch/arm/boot/dts/mmp* F: arch/arm/boot/dts/mmp*
F: arch/arm/mach-mmp/ F: arch/arm/mach-mmp/
F: linux/soc/mmp/ F: include/linux/soc/mmp/
MMP USB PHY DRIVERS MMP USB PHY DRIVERS
R: Lubomir Rintel <lkundrak@v3.sk> R: Lubomir Rintel <lkundrak@v3.sk>
......
...@@ -523,7 +523,7 @@ config MEMMAP_CACHEATTR ...@@ -523,7 +523,7 @@ config MEMMAP_CACHEATTR
2: cache bypass, 2: cache bypass,
4: WB cached, 4: WB cached,
f: illegal. f: illegal.
For ful MMU: For full MMU:
bit 0: executable, bit 0: executable,
bit 1: writable, bit 1: writable,
bits 2..3: bits 2..3:
......
...@@ -820,7 +820,7 @@ static void logi_dj_recv_queue_unknown_work(struct dj_receiver_dev *djrcv_dev) ...@@ -820,7 +820,7 @@ static void logi_dj_recv_queue_unknown_work(struct dj_receiver_dev *djrcv_dev)
{ {
struct dj_workitem workitem = { .type = WORKITEM_TYPE_UNKNOWN }; struct dj_workitem workitem = { .type = WORKITEM_TYPE_UNKNOWN };
/* Rate limit queries done because of unhandeled reports to 2/sec */ /* Rate limit queries done because of unhandled reports to 2/sec */
if (time_before(jiffies, djrcv_dev->last_query + HZ / 2)) if (time_before(jiffies, djrcv_dev->last_query + HZ / 2))
return; return;
......
...@@ -144,8 +144,7 @@ static int oxnas_nand_probe(struct platform_device *pdev) ...@@ -144,8 +144,7 @@ static int oxnas_nand_probe(struct platform_device *pdev)
if (err) if (err)
goto err_cleanup_nand; goto err_cleanup_nand;
oxnas->chips[oxnas->nchips] = chip; oxnas->chips[oxnas->nchips++] = chip;
++oxnas->nchips;
} }
/* Exit if no chips found */ /* Exit if no chips found */
......
...@@ -134,7 +134,7 @@ static bool vboxsf_dir_emit(struct file *dir, struct dir_context *ctx) ...@@ -134,7 +134,7 @@ static bool vboxsf_dir_emit(struct file *dir, struct dir_context *ctx)
d_type = vboxsf_get_d_type(info->info.attr.mode); d_type = vboxsf_get_d_type(info->info.attr.mode);
/* /*
* On 32 bit systems pos is 64 signed, while ino is 32 bit * On 32-bit systems pos is 64-bit signed, while ino is 32-bit
* unsigned so fake_ino may overflow, check for this. * unsigned so fake_ino may overflow, check for this.
*/ */
if ((ino_t)(ctx->pos + 1) != (u64)(ctx->pos + 1)) { if ((ino_t)(ctx->pos + 1) != (u64)(ctx->pos + 1)) {
......
...@@ -657,7 +657,7 @@ int scif_unregister(scif_epd_t epd, off_t offset, size_t len); ...@@ -657,7 +657,7 @@ int scif_unregister(scif_epd_t epd, off_t offset, size_t len);
* the negative of one of the following errors is returned. * the negative of one of the following errors is returned.
* *
* Errors: * Errors:
* EACCESS - Attempt to write to a read-only range * EACCES - Attempt to write to a read-only range
* EBADF, ENOTTY - epd is not a valid endpoint descriptor * EBADF, ENOTTY - epd is not a valid endpoint descriptor
* ECONNRESET - Connection reset by peer * ECONNRESET - Connection reset by peer
* EINVAL - rma_flags is invalid * EINVAL - rma_flags is invalid
...@@ -733,7 +733,7 @@ int scif_readfrom(scif_epd_t epd, off_t loffset, size_t len, off_t ...@@ -733,7 +733,7 @@ int scif_readfrom(scif_epd_t epd, off_t loffset, size_t len, off_t
* the negative of one of the following errors is returned. * the negative of one of the following errors is returned.
* *
* Errors: * Errors:
* EACCESS - Attempt to write to a read-only range * EACCES - Attempt to write to a read-only range
* EBADF, ENOTTY - epd is not a valid endpoint descriptor * EBADF, ENOTTY - epd is not a valid endpoint descriptor
* ECONNRESET - Connection reset by peer * ECONNRESET - Connection reset by peer
* EINVAL - rma_flags is invalid * EINVAL - rma_flags is invalid
...@@ -815,7 +815,7 @@ int scif_writeto(scif_epd_t epd, off_t loffset, size_t len, off_t ...@@ -815,7 +815,7 @@ int scif_writeto(scif_epd_t epd, off_t loffset, size_t len, off_t
* the negative of one of the following errors is returned. * the negative of one of the following errors is returned.
* *
* Errors: * Errors:
* EACCESS - Attempt to write to a read-only range * EACCES - Attempt to write to a read-only range
* EBADF, ENOTTY - epd is not a valid endpoint descriptor * EBADF, ENOTTY - epd is not a valid endpoint descriptor
* ECONNRESET - Connection reset by peer * ECONNRESET - Connection reset by peer
* EINVAL - rma_flags is invalid * EINVAL - rma_flags is invalid
...@@ -895,7 +895,7 @@ int scif_vreadfrom(scif_epd_t epd, void *addr, size_t len, off_t roffset, ...@@ -895,7 +895,7 @@ int scif_vreadfrom(scif_epd_t epd, void *addr, size_t len, off_t roffset,
* the negative of one of the following errors is returned. * the negative of one of the following errors is returned.
* *
* Errors: * Errors:
* EACCESS - Attempt to write to a read-only range * EACCES - Attempt to write to a read-only range
* EBADF, ENOTTY - epd is not a valid endpoint descriptor * EBADF, ENOTTY - epd is not a valid endpoint descriptor
* ECONNRESET - Connection reset by peer * ECONNRESET - Connection reset by peer
* EINVAL - rma_flags is invalid * EINVAL - rma_flags is invalid
......
...@@ -468,7 +468,7 @@ static void __init setup_boot_config(const char *cmdline) ...@@ -468,7 +468,7 @@ static void __init setup_boot_config(const char *cmdline)
static int __init warn_bootconfig(char *str) static int __init warn_bootconfig(char *str)
{ {
pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOTCONFIG is not set.\n"); pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOT_CONFIG is not set.\n");
return 0; return 0;
} }
early_param("bootconfig", warn_bootconfig); early_param("bootconfig", warn_bootconfig);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* is later flushed into the main ring buffer via IRQ work. * is later flushed into the main ring buffer via IRQ work.
* *
* The alternative implementation is chosen transparently * The alternative implementation is chosen transparently
* by examinig current printk() context mask stored in @printk_context * by examining current printk() context mask stored in @printk_context
* per-CPU variable. * per-CPU variable.
* *
* The implementation allows to flush the strings also from another CPU. * The implementation allows to flush the strings also from another CPU.
......
...@@ -552,7 +552,7 @@ static inline bool end_of_region(char c) ...@@ -552,7 +552,7 @@ static inline bool end_of_region(char c)
} }
/* /*
* The format allows commas and whitespases at the beginning * The format allows commas and whitespaces at the beginning
* of the region. * of the region.
*/ */
static const char *bitmap_find_region(const char *str) static const char *bitmap_find_region(const char *str)
......
...@@ -598,7 +598,6 @@ extenstion||extension ...@@ -598,7 +598,6 @@ extenstion||extension
extracter||extractor extracter||extractor
faied||failed faied||failed
faield||failed faield||failed
falied||failed
faild||failed faild||failed
failded||failed failded||failed
failer||failure failer||failure
...@@ -795,7 +794,6 @@ interrup||interrupt ...@@ -795,7 +794,6 @@ interrup||interrupt
interrups||interrupts interrups||interrupts
interruptted||interrupted interruptted||interrupted
interupted||interrupted interupted||interrupted
interupt||interrupt
intial||initial intial||initial
intialisation||initialisation intialisation||initialisation
intialised||initialised intialised||initialised
...@@ -971,7 +969,6 @@ occurd||occurred ...@@ -971,7 +969,6 @@ occurd||occurred
occured||occurred occured||occurred
occurence||occurrence occurence||occurrence
occure||occurred occure||occurred
occured||occurred
occuring||occurring occuring||occurring
offser||offset offser||offset
offet||offset offet||offset
...@@ -1440,7 +1437,6 @@ udpate||update ...@@ -1440,7 +1437,6 @@ udpate||update
uesd||used uesd||used
uknown||unknown uknown||unknown
usccess||success usccess||success
usupported||unsupported
uncommited||uncommitted uncommited||uncommitted
uncompatible||incompatible uncompatible||incompatible
unconditionaly||unconditionally unconditionaly||unconditionally
......
...@@ -3,3 +3,4 @@ CONFIG_USERFAULTFD=y ...@@ -3,3 +3,4 @@ CONFIG_USERFAULTFD=y
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_DEVICE_PRIVATE=y CONFIG_DEVICE_PRIVATE=y
CONFIG_TEST_HMM=m CONFIG_TEST_HMM=m
CONFIG_GUP_BENCHMARK=y
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment