Commit bbf62599 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -11702,7 +11702,7 @@ S: Odd Fixes 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git

F:	arch/arm/boot/dts/mmp*

F:	arch/arm/mach-mmp/

F:	linux/soc/mmp/

F:	include/linux/soc/mmp/















MMP USB PHY DRIVERS















R:	Lubomir Rintel <lkundrak@v3.sk>

































arch/xtensa/Kconfig



+1
−1






























Original line number
Diff line number
Diff line








@@ -523,7 +523,7 @@ config MEMMAP_CACHEATTR













	    2: cache bypass,















	    4: WB cached,















	    f: illegal.













	  For ful MMU:













	  For full MMU:















	    bit 0: executable,















	    bit 1: writable,















	    bits 2..3:

































drivers/hid/hid-logitech-dj.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -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 };





























	/* 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))















		return;

















































drivers/mtd/nand/raw/oxnas_nand.c



+1
−2






























Original line number
Diff line number
Diff line








@@ -144,8 +144,7 @@ static int oxnas_nand_probe(struct platform_device *pdev)













		if (err)















			goto err_cleanup_nand;





























		oxnas->chips[oxnas->nchips] = chip;













		++oxnas->nchips;













		oxnas->chips[oxnas->nchips++] = chip;















	}































	/* Exit if no chips found */

































fs/vboxsf/dir.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -134,7 +134,7 @@ try_next_entry:













		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.















		 */















		if ((ino_t)(ctx->pos + 1) != (u64)(ctx->pos + 1)) {









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE