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

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/mach-bcm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig
Simple merge

diff --cc arch/unicore32/Kconfig
Simple merge

diff --cc arch/xtensa/Kconfig
Simple merge

diff --cc drivers/power/supply/Kconfig
index fbca0ba7fc52d3b1350b44e77f06a8871850e2cf,382669bf31f40a04d3b76d507c78998156536618..428b426842f4bbc574bb100215bd989f9ded602b
--- 1/drivers/power/supply/Kconfig
--- 2/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@@ -182,22 -182,8 +182,22 @@@ config CHARGER_SB
          tristate "SBS Compliant charger"
          depends on I2C
          help
-         Say Y to include support for SBS compilant battery chargers.
+         Say Y to include support for SBS compliant battery chargers.
  
 +config MANAGER_SBS
 +      tristate "Smart Battery System Manager"
 +      depends on I2C && I2C_MUX && GPIOLIB
 +      select I2C_SMBUS
 +      help
 +        Say Y here to include support for Smart Battery System Manager
 +        ICs. The driver reports online and charging status via sysfs.
 +        It presents itself also as I2C mux which allows to bind
 +        smart battery driver to its ports.
 +        Supported is for example LTC1760.
 +
 +        This driver can also be built as a module. If so, the module will be
 +        called sbs-manager.
 +
  config BATTERY_BQ27XXX
        tristate "BQ27xxx battery driver"
        help

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc samples/trace_events/trace-events-sample.h
Simple merge