Commit 9682b3de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull trivial tree updates from Jiri Kosina:
 "The usual rocket-science from trivial tree for 4.15"

* 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  MAINTAINERS: relinquish kconfig
  MAINTAINERS: Update my email address
  treewide: Fix typos in Kconfig
  kfifo: Fix comments
  init/Kconfig: Fix module signing document location
  misc: ibmasm: Return error on error path
  HID: logitech-hidpp: fix mistake in printk, "feeback" -> "feedback"
  MAINTAINERS: Correct path to uDraw PS3 driver
  tracing: Fix doc mistakes in trace sample
  tracing: Kconfig text fixes for CONFIG_HWLAT_TRACER
  MIPS: Alchemy: Remove reverted CONFIG_NETLINK_MMAP from db1xxx_defconfig
  mm/huge_memory.c: fixup grammar in comment
  lib/xz: Add fall-through comments to a switch statement
parents 20df1578 1972d6c0

MAINTAINERS

+4 −6
Original line number Diff line number Diff line
@@ -3472,7 +3472,7 @@ COCCINELLE/Semantic Patches (SmPL) 
M:	Julia Lawall <Julia.Lawall@lip6.fr>

M:	Gilles Muller <Gilles.Muller@lip6.fr>

M:	Nicolas Palix <nicolas.palix@imag.fr>

M:	Michal Marek <mmarek@suse.com>

M:	Michal Marek <michal.lkml@markovi.net>

L:	cocci@systeme.lip6.fr (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc

W:	http://coccinelle.lip6.fr/
@@ -7448,10 +7448,8 @@ F: mm/kasan/ 
F:	scripts/Makefile.kasan



KCONFIG

M:	"Yann E. MORIN" <yann.morin.1998@free.fr>

L:	linux-kbuild@vger.kernel.org

T:	git git://gitorious.org/linux-kconfig/linux-kconfig

S:	Maintained

S:	Orphan

F:	Documentation/kbuild/kconfig-language.txt

F:	scripts/kconfig/
@@ -7480,7 +7478,7 @@ F: fs/autofs4/ 


KERNEL BUILD + files below scripts/ (unless maintained elsewhere)

M:	Masahiro Yamada <yamada.masahiro@socionext.com>

M:	Michal Marek <mmarek@suse.com>

M:	Michal Marek <michal.lkml@markovi.net>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git

L:	linux-kbuild@vger.kernel.org

S:	Maintained
@@ -13784,7 +13782,7 @@ UDRAW TABLET 
M:	Bastien Nocera <hadess@hadess.net>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/hid/hid-udraw.c

F:	drivers/hid/hid-udraw-ps3.c



UFS FILESYSTEM

M:	Evgeniy Dushistov <dushistov@mail.ru>

arch/alpha/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ config ALPHA_QEMU 


	  Generic kernels will auto-detect QEMU.  But when building a

	  system-specific kernel, the assumption is that we want to

	  elimiate as many runtime tests as possible.

	  eliminate as many runtime tests as possible.



	  If unsure, say N.

arch/arc/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ config ARC_MMU_V1 
config ARC_MMU_V2

	bool "MMU v2"

	help

	  Fixed the deficiency of v1 - possible thrashing in memcpy sceanrio

	  Fixed the deficiency of v1 - possible thrashing in memcpy scenario

	  when 2 D-TLB and 1 I-TLB entries index into same 2way set.



config ARC_MMU_V3
@@ -371,7 +371,7 @@ config ARC_FPU_SAVE_RESTORE 
	bool "Enable FPU state persistence across context switch"

	default n

	help

	  Double Precision Floating Point unit had dedictaed regs which

	  Double Precision Floating Point unit had dedicated regs which

	  need to be saved/restored across context-switch.

	  Note that ARC FPU is overly simplistic, unlike say x86, which has

	  hardware pieces to allow software to conditionally save/restore,
@@ -467,7 +467,7 @@ config ARC_PLAT_NEEDS_PHYS_TO_DMA 
	bool



config ARC_KVADDR_SIZE

	int "Kernel Virtaul Address Space size (MB)"

	int "Kernel Virtual Address Space size (MB)"

	range 0 512

	default "256"

	help

arch/arm/mach-bcm/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ config ARCH_BCM_IPROC 
	help

	  This enables support for systems based on Broadcom IPROC architected SoCs.

	  The IPROC complex contains one or more ARM CPUs along with common

	  core periperals. Application specific SoCs are created by adding a

	  core peripherals. Application specific SoCs are created by adding a

	  uArchitecture containing peripherals outside of the IPROC complex.

	  Currently supported SoCs are Cygnus.
@@ -69,8 +69,8 @@ config ARCH_BCM_5301X 
	  Support for Broadcom BCM470X and BCM5301X SoCs with ARM CPU cores.



	  This is a network SoC line mostly used in home routers and

	  wifi access points, it's internal name is Northstar.

	  This inclused the following SoC: BCM53010, BCM53011, BCM53012,

	  wifi access points, its internal name is Northstar.

	  This includes the following SoC: BCM53010, BCM53011, BCM53012,

	  BCM53014, BCM53015, BCM53016, BCM53017, BCM53018, BCM4707,

	  BCM4708 and BCM4709.

arch/arm/plat-samsung/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ config SAMSUNG_PM_CHECK_CHUNKSIZE 
	help

	  Set the chunksize in Kilobytes of the CRC for checking memory

	  corruption over suspend and resume. A smaller value will mean that

	  the CRC data block will take more memory, but wil identify any

	  the CRC data block will take more memory, but will identify any

	  faults with better precision.



	  See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>

CRA Git | Maintained and supported by SUSTech CRA and CCSE