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 --combined MAINTAINERS
index fbebd08,b1c1060..f6fed47
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -527,6 -527,11 +527,6 @@@ W:        http://ez.analog.com/community/linux
  S:    Supported
  F:    drivers/input/misc/adxl34x.c
  
 -AEDSP16 DRIVER
 -M:    Riccardo Facchetti <fizban@tin.it>
 -S:    Maintained
 -F:    sound/oss/aedsp16.c
 -
  AF9013 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -868,7 -873,7 +868,7 @@@ F: drivers/android
  F:    drivers/staging/android/
  
  ANDROID GOLDFISH RTC DRIVER
 -M:    Miodrag Dinic <miodrag.dinic@imgtec.com>
 +M:    Miodrag Dinic <miodrag.dinic@mips.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
  F:    drivers/rtc/rtc-goldfish.c
@@@ -2024,7 -2029,6 +2024,7 @@@ M:      Masahiro Yamada <yamada.masahiro@soc
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
  F:    arch/arm/boot/dts/uniphier*
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
@@@ -2032,7 -2036,6 +2032,7 @@@ F:      arch/arm/mm/cache-uniphier.
  F:    arch/arm64/boot/dts/socionext/
  F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/clk/uniphier/
 +F:    drivers/gpio/gpio-uniphier.c
  F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/irqchip/irq-uniphier-aidet.c
  F:    drivers/pinctrl/uniphier/
@@@ -2244,7 -2247,7 +2244,7 @@@ F:      include/linux/dmaengine.
  F:    include/linux/async_tx.h
  
  AT24 EEPROM DRIVER
 -M:    Wolfram Sang <wsa@the-dreams.de>
 +M:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    drivers/misc/eeprom/at24.c
@@@ -2559,12 -2562,10 +2559,12 @@@ S:   Maintaine
  F:    drivers/net/hamradio/baycom*
  
  BCACHE (BLOCK LAYER CACHE)
 +M:    Michael Lyle <mlyle@lyle.org>
  M:    Kent Overstreet <kent.overstreet@gmail.com>
  L:    linux-bcache@vger.kernel.org
  W:    http://bcache.evilpiepirate.org
 -S:    Orphan
 +C:    irc://irc.oftc.net/bcache
 +S:    Maintained
  F:    drivers/md/bcache/
  
  BDISP ST MEDIA DRIVER
@@@ -2895,13 -2896,6 +2895,13 @@@ S:    Supporte
  F:    drivers/gpio/gpio-brcmstb.c
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
  
 +BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
 +M:    Al Cooper <alcooperx@gmail.com>
 +L:    linux-kernel@vger.kernel.org
 +L:    bcm-kernel-feedback-list@broadcom.com
 +S:    Maintained
 +F:    drivers/phy/broadcom/phy-brcm-usb*
 +
  BROADCOM GENET ETHERNET DRIVER
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    netdev@vger.kernel.org
@@@ -3450,8 -3444,7 +3450,8 @@@ M:      Thomas Gleixner <tglx@linutronix.de
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
 -F:    drivers/clocksource
 +F:    drivers/clocksource/
 +F:    Documentation/devicetree/bindings/timer/
  
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
@@@ -3472,7 -3465,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/
@@@ -3643,8 -3636,6 +3643,8 @@@ F:      drivers/cpufreq/arm_big_little_dt.
  
  CPU POWER MONITORING SUBSYSTEM
  M:    Thomas Renninger <trenn@suse.com>
 +M:    Shuah Khan <shuahkh@osg.samsung.com>
 +M:    Shuah Khan <shuah@kernel.org>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  F:    tools/power/cpupower/
@@@ -4100,8 -4091,6 +4100,8 @@@ T:      git git://git.kernel.org/pub/scm/lin
  T:    quilt http://people.redhat.com/agk/patches/linux/editing/
  S:    Maintained
  F:    Documentation/device-mapper/
 +F:    drivers/md/Makefile
 +F:    drivers/md/Kconfig
  F:    drivers/md/dm*
  F:    drivers/md/persistent-data/
  F:    include/linux/device-mapper.h
@@@ -4245,7 -4234,7 +4245,7 @@@ S:      Maintaine
  F:    drivers/dma/
  F:    include/linux/dmaengine.h
  F:    Documentation/devicetree/bindings/dma/
 -F:    Documentation/dmaengine/
 +F:    Documentation/driver-api/dmaengine/
  T:    git git://git.infradead.org/users/vkoul/slave-dma.git
  
  DMA MAPPING HELPERS
@@@ -4917,19 -4906,13 +4917,19 @@@ L:   linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/highbank*
  
 -EDAC-CAVIUM
 +EDAC-CAVIUM OCTEON
  M:    Ralf Baechle <ralf@linux-mips.org>
  M:    David Daney <david.daney@cavium.com>
  L:    linux-edac@vger.kernel.org
  L:    linux-mips@linux-mips.org
  S:    Supported
  F:    drivers/edac/octeon_edac*
 +
 +EDAC-CAVIUM THUNDERX
 +M:    David Daney <david.daney@cavium.com>
 +M:    Jan Glauber <jglauber@cavium.com>
 +L:    linux-edac@vger.kernel.org
 +S:    Supported
  F:    drivers/edac/thunderx_edac*
  
  EDAC-CORE
@@@ -5230,7 -5213,8 +5230,7 @@@ F:      fs/ext4
  
  Extended Verification Module (EVM)
  M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 -L:    linux-ima-devel@lists.sourceforge.net
 -L:    linux-security-module@vger.kernel.org
 +L:    linux-integrity@vger.kernel.org
  S:    Supported
  F:    security/integrity/evm/
  
@@@ -5485,7 -5469,7 +5485,7 @@@ F:      include/uapi/linux/fb.
  
  FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER
  M:    Horia Geantă <horia.geanta@nxp.com>
 -M:    Dan Douglass <dan.douglass@nxp.com>
 +M:    Aymen Sghaier <aymen.sghaier@nxp.com>
  L:    linux-crypto@vger.kernel.org
  S:    Maintained
  F:    drivers/crypto/caam/
@@@ -5665,7 -5649,6 +5665,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    fs/crypto/
  F:    include/linux/fscrypt*.h
 +F:    Documentation/filesystems/fscrypt.rst
  
  FUJITSU FR-V (FRV) PORT
  S:    Orphan
@@@ -6688,7 -6671,7 +6688,7 @@@ F:      include/net/ieee802154_netdev.
  F:    Documentation/networking/ieee802154.txt
  
  IFE PROTOCOL
 -M:    Yotam Gigi <yotamg@mellanox.com>
 +M:    Yotam Gigi <yotam.gi@gmail.com>
  M:    Jamal Hadi Salim <jhs@mojatatu.com>
  F:    net/ife
  F:    include/net/ife.h
@@@ -6750,7 -6733,7 +6750,7 @@@ S:      Maintaine
  F:    drivers/usb/atm/ueagle-atm.c
  
  IMGTEC ASCII LCD DRIVER
 -M:    Paul Burton <paul.burton@imgtec.com>
 +M:    Paul Burton <paul.burton@mips.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
  F:    drivers/auxdisplay/img-ascii-lcd.c
@@@ -6858,7 -6841,9 +6858,7 @@@ L:      linux-crypto@vger.kernel.or
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
  M:    Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
 -L:    linux-ima-devel@lists.sourceforge.net
 -L:    linux-ima-user@lists.sourceforge.net
 -L:    linux-security-module@vger.kernel.org
 +L:    linux-integrity@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  S:    Supported
  F:    security/integrity/ima/
@@@ -7448,10 -7433,8 +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 -7463,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
@@@ -7586,7 -7569,7 +7584,7 @@@ F:      arch/mips/include/asm/kvm
  F:    arch/mips/kvm/
  
  KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
 -M:    Alexander Graf <agraf@suse.com>
 +M:    Paul Mackerras <paulus@ozlabs.org>
  L:    kvm-ppc@vger.kernel.org
  W:    http://www.linux-kvm.org/
  T:    git git://github.com/agraf/linux-2.6.git
@@@ -7641,7 -7624,8 +7639,7 @@@ F:      kernel/kexec
  
  KEYS-ENCRYPTED
  M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 -M:    David Safford <safford@us.ibm.com>
 -L:    linux-security-module@vger.kernel.org
 +L:    linux-integrity@vger.kernel.org
  L:    keyrings@vger.kernel.org
  S:    Supported
  F:    Documentation/security/keys/trusted-encrypted.rst
@@@ -7649,8 -7633,9 +7647,8 @@@ F:      include/keys/encrypted-type.
  F:    security/keys/encrypted-keys/
  
  KEYS-TRUSTED
 -M:    David Safford <safford@us.ibm.com>
  M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 -L:    linux-security-module@vger.kernel.org
 +L:    linux-integrity@vger.kernel.org
  L:    keyrings@vger.kernel.org
  S:    Supported
  F:    Documentation/security/keys/trusted-encrypted.rst
@@@ -7758,11 -7743,6 +7756,11 @@@ S:    Maintaine
  F:    Documentation/scsi/53c700.txt
  F:    drivers/scsi/53c700*
  
 +LEAKING_ADDRESSES
 +M:    Tobin C. Harding <me@tobin.cc>
 +S:    Maintained
 +F:    scripts/leaking_addresses.pl
 +
  LED SUBSYSTEM
  M:    Richard Purdie <rpurdie@rpsys.net>
  M:    Jacek Anaszewski <jacek.anaszewski@gmail.com>
@@@ -8761,7 -8741,7 +8759,7 @@@ Q:      http://patchwork.ozlabs.org/project/
  F:    drivers/net/ethernet/mellanox/mlxsw/
  
  MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
 -M:    Yotam Gigi <yotamg@mellanox.com>
 +M:    mlxsw@mellanox.com
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
@@@ -9011,7 -8991,7 +9009,7 @@@ F:      Documentation/mips
  F:    arch/mips/
  
  MIPS BOSTON DEVELOPMENT BOARD
 -M:    Paul Burton <paul.burton@imgtec.com>
 +M:    Paul Burton <paul.burton@mips.com>
  L:    linux-mips@linux-mips.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/clock/img,boston-clock.txt
@@@ -9021,7 -9001,7 +9019,7 @@@ F:      drivers/clk/imgtec/clk-boston.
  F:    include/dt-bindings/clock/boston-clock.h
  
  MIPS GENERIC PLATFORM
 -M:    Paul Burton <paul.burton@imgtec.com>
 +M:    Paul Burton <paul.burton@mips.com>
  L:    linux-mips@linux-mips.org
  S:    Supported
  F:    arch/mips/generic/
@@@ -9037,7 -9017,7 +9035,7 @@@ F:      drivers/*/*loongson1
  F:    drivers/*/*/*loongson1*
  
  MIPS RINT INSTRUCTION EMULATION
 -M:    Aleksandar Markovic <aleksandar.markovic@imgtec.com>
 +M:    Aleksandar Markovic <aleksandar.markovic@mips.com>
  L:    linux-mips@linux-mips.org
  S:    Supported
  F:    arch/mips/math-emu/sp_rint.c
@@@ -9217,6 -9197,12 +9215,6 @@@ F:     include/linux/dt-bindings/mux
  F:    include/linux/mux/
  F:    drivers/mux/
  
 -MULTISOUND SOUND DRIVER
 -M:    Andrew Veliath <andrewtv@usa.net>
 -S:    Maintained
 -F:    Documentation/sound/oss/MultiSound
 -F:    sound/oss/msnd*
 -
  MULTITECH MULTIPORT CARD (ISICOM)
  S:    Orphan
  F:    drivers/tty/isicom.c
@@@ -9225,6 -9211,7 +9223,6 @@@ F:      include/linux/isicom.
  MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
  M:    Bin Liu <b-liu@ti.com>
  L:    linux-usb@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/musb/
  
@@@ -10043,11 -10030,7 +10041,11 @@@ T: git git://github.com/openrisc/linux.
  L:    openrisc@lists.librecores.org
  W:    http://openrisc.io
  S:    Maintained
 +F:    Documentation/devicetree/bindings/openrisc/
 +F:    Documentation/openrisc/
  F:    arch/openrisc/
 +F:    drivers/irqchip/irq-ompic.c
 +F:    drivers/irqchip/irq-or1k-*
  
  OPENVSWITCH
  M:    Pravin Shelar <pshelar@nicira.com>
@@@ -10065,7 -10048,7 +10063,7 @@@ M:   Stephen Boyd <sboyd@codeaurora.org
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
 -F:    drivers/base/power/opp/
 +F:    drivers/opp/
  F:    include/linux/pm_opp.h
  F:    Documentation/power/opp.txt
  F:    Documentation/devicetree/bindings/opp/
@@@ -10195,6 -10178,7 +10193,6 @@@ F:   Documentation/parport*.tx
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <jgross@suse.com>
 -M:    Chris Wright <chrisw@sous-sol.org>
  M:    Alok Kataria <akataria@vmware.com>
  M:    Rusty Russell <rusty@rustcorp.com.au>
  L:    virtualization@lists.linux-foundation.org
@@@ -10352,6 -10336,7 +10350,6 @@@ F:   drivers/pci/host/vmd.
  
  PCI DRIVER FOR MICROSEMI SWITCHTEC
  M:    Kurt Schwemmer <kurt.schwemmer@microsemi.com>
 -M:    Stephen Bates <stephen.bates@microsemi.com>
  M:    Logan Gunthorpe <logang@deltatee.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
@@@ -10416,7 -10401,6 +10414,7 @@@ F:   drivers/pci/dwc/*keystone
  
  PCI ENDPOINT SUBSYSTEM
  M:    Kishon Vijay Abraham I <kishon@ti.com>
 +M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  L:    linux-pci@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git
  S:    Supported
@@@ -10468,15 -10452,6 +10466,15 @@@ F: include/linux/pci
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
 +PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
 +M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +L:    linux-pci@vger.kernel.org
 +Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
 +S:    Supported
 +F:    drivers/pci/host/
 +F:    drivers/pci/dwc/
 +
  PCIE DRIVER FOR AXIS ARTPEC
  M:    Niklas Cassel <niklas.cassel@axis.com>
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
@@@ -10496,6 -10471,7 +10494,6 @@@ F:   drivers/pci/host/pci-thunder-
  
  PCIE DRIVER FOR HISILICON
  M:    Zhou Wang <wangzhou1@hisilicon.com>
 -M:    Gabriele Paoloni <gabriele.paoloni@huawei.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
@@@ -10582,8 -10558,6 +10580,8 @@@ M:   Peter Zijlstra <peterz@infradead.org
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Arnaldo Carvalho de Melo <acme@kernel.org>
  R:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 +R:    Jiri Olsa <jolsa@redhat.com>
 +R:    Namhyung Kim <namhyung@kernel.org>
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Supported
@@@ -10707,9 -10681,10 +10705,9 @@@ S:  Maintaine
  F:    drivers/pinctrl/spear/
  
  PISTACHIO SOC SUPPORT
 -M:    James Hartley <james.hartley@imgtec.com>
 -M:    Ionela Voinescu <ionela.voinescu@imgtec.com>
 +M:    James Hartley <james.hartley@sondrel.com>
  L:    linux-mips@linux-mips.org
 -S:    Maintained
 +S:    Odd Fixes
  F:    arch/mips/pistachio/
  F:    arch/mips/include/asm/mach-pistachio/
  F:    arch/mips/boot/dts/img/pistachio*
@@@ -10913,7 -10888,7 +10911,7 @@@ S:   Maintaine
  F:    drivers/block/ps3vram.c
  
  PSAMPLE PACKET SAMPLING SUPPORT:
 -M:    Yotam Gigi <yotamg@mellanox.com>
 +M:    Yotam Gigi <yotam.gi@gmail.com>
  S:    Maintained
  F:    net/psample
  F:    include/net/psample.h
@@@ -11056,6 -11031,7 +11054,6 @@@ F:   drivers/mtd/nand/pxa3xx_nand.
  
  QAT DRIVER
  M:    Giovanni Cabiddu <giovanni.cabiddu@intel.com>
 -M:    Salvatore Benedetto <salvatore.benedetto@intel.com>
  L:    qat-linux@intel.com
  S:    Supported
  F:    drivers/crypto/qat/
@@@ -11788,7 -11764,7 +11786,7 @@@ L:   linux-crypto@vger.kernel.or
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/crypto/exynos-rng.c
 -F:    Documentation/devicetree/bindings/rng/samsung,exynos-rng4.txt
 +F:    Documentation/devicetree/bindings/crypto/samsung,exynos-rng4.txt
  
  SAMSUNG FRAMEBUFFER DRIVER
  M:    Jingoo Han <jingoohan1@gmail.com>
@@@ -12071,15 -12047,10 +12069,15 @@@ L:        linux-mmc@vger.kernel.or
  S:    Maintained
  F:    drivers/mmc/host/sdhci-spear.c
  
 +SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) TI OMAP DRIVER
 +M:    Kishon Vijay Abraham I <kishon@ti.com>
 +L:    linux-mmc@vger.kernel.org
 +S:    Maintained
 +F:    drivers/mmc/host/sdhci-omap.c
 +
  SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
  M:    Scott Bauer <scott.bauer@intel.com>
  M:    Jonathan Derrick <jonathan.derrick@intel.com>
 -M:    Rafael Antognolli <rafael.antognolli@intel.com>
  L:    linux-block@vger.kernel.org
  S:    Supported
  F:    block/sed*
@@@ -12480,10 -12451,7 +12478,10 @@@ M: Shaohua Li <shli@kernel.org
  L:    linux-raid@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
  S:    Supported
 -F:    drivers/md/
 +F:    drivers/md/Makefile
 +F:    drivers/md/Kconfig
 +F:    drivers/md/md*
 +F:    drivers/md/raid*
  F:    include/linux/raid/
  F:    include/uapi/linux/raid/
  
@@@ -12936,16 -12904,9 +12934,16 @@@ F: arch/arc/plat-axs10
  F:    arch/arc/boot/dts/ax*
  F:    Documentation/devicetree/bindings/arc/axs10*
  
 +SYNOPSYS DESIGNWARE APB GPIO DRIVER
 +M:    Hoan Tran <hotran@apm.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-dwapb.c
 +F:    Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
 +
  SYNOPSYS DESIGNWARE DMAC DRIVER
  M:    Viresh Kumar <vireshk@kernel.org>
 -M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  S:    Maintained
  F:    include/linux/dma/dw.h
  F:    include/linux/platform_data/dma-dw.h
@@@ -13636,14 -13597,23 +13634,14 @@@ F:        drivers/platform/x86/toshiba-wmi.
  
  TPM DEVICE DRIVER
  M:    Peter Huewe <peterhuewe@gmx.de>
 -M:    Marcel Selhorst <tpmdd@selhorst.net>
  M:    Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
  R:    Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
 -W:    http://tpmdd.sourceforge.net
 -L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 -Q:    https://patchwork.kernel.org/project/tpmdd-devel/list/
 +L:    linux-integrity@vger.kernel.org
 +Q:    https://patchwork.kernel.org/project/linux-integrity/list/
  T:    git git://git.infradead.org/users/jjs/linux-tpmdd.git
  S:    Maintained
  F:    drivers/char/tpm/
  
 -TPM IBM_VTPM DEVICE DRIVER
 -M:    Ashley Lai <ashleydlai@gmail.com>
 -W:    http://tpmdd.sourceforge.net
 -L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 -S:    Maintained
 -F:    drivers/char/tpm/tpm_ibmvtpm*
 -
  TRACING
  M:    Steven Rostedt <rostedt@goodmis.org>
  M:    Ingo Molnar <mingo@redhat.com>
@@@ -13784,7 -13754,7 +13782,7 @@@ UDRAW TABLE
  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>
@@@ -14353,7 -14323,6 +14351,7 @@@ L:   virtualization@lists.linux-foundatio
  L:    kvm@vger.kernel.org
  S:    Supported
  F:    drivers/s390/virtio/
 +F:    arch/s390/include/uapi/asm/virtio-ccw.h
  
  VIRTIO GPU DRIVER
  M:    David Airlie <airlied@linux.ie>
@@@ -14627,7 -14596,6 +14625,7 @@@ F:   Documentation/devicetree/bindings/ex
  F:    Documentation/devicetree/bindings/regulator/arizona-regulator.txt
  F:    Documentation/devicetree/bindings/mfd/arizona.txt
  F:    Documentation/devicetree/bindings/mfd/wm831x.txt
 +F:    Documentation/devicetree/bindings/sound/wlf,arizona.txt
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
  F:    drivers/clk/clk-wm83*.c
  F:    drivers/extcon/extcon-arizona.c

diff --combined arch/alpha/Kconfig
index 69b8758,aa6b119..b31b974
--- 1/arch/alpha/Kconfig
--- 2/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@@ -1,4 -1,3 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0
  config ALPHA
        bool
        default y
@@@ -506,7 -505,7 +506,7 @@@ config ALPHA_QEM
  
          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.
  

diff --combined arch/arm/mach-bcm/Kconfig
index 5d2925e,2ff115a..53efe8b
--- 1/arch/arm/mach-bcm/Kconfig
--- 2/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@@ -1,4 -1,3 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0
  menuconfig ARCH_BCM
        bool "Broadcom SoC Support"
        depends on ARCH_MULTI_V6_V7
@@@ -23,7 -22,7 +23,7 @@@ config ARCH_BCM_IPRO
        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 -68,8 +69,8 @@@ config ARCH_BCM_5301
          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.
  

diff --combined arch/arm64/Kconfig
index 6205f52,416dbc6..b907bf4
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -22,24 -22,7 +22,24 @@@ config ARM6
        select ARCH_HAS_STRICT_MODULE_RWX
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_HAVE_NMI_SAFE_CMPXCHG if ACPI_APEI_SEA
 +      select ARCH_INLINE_READ_LOCK if !PREEMPT
 +      select ARCH_INLINE_READ_LOCK_BH if !PREEMPT
 +      select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPT
 +      select ARCH_INLINE_READ_LOCK_IRQSAVE if !PREEMPT
 +      select ARCH_INLINE_READ_UNLOCK if !PREEMPT
 +      select ARCH_INLINE_READ_UNLOCK_BH if !PREEMPT
 +      select ARCH_INLINE_READ_UNLOCK_IRQ if !PREEMPT
 +      select ARCH_INLINE_READ_UNLOCK_IRQRESTORE if !PREEMPT
 +      select ARCH_INLINE_WRITE_LOCK if !PREEMPT
 +      select ARCH_INLINE_WRITE_LOCK_BH if !PREEMPT
 +      select ARCH_INLINE_WRITE_LOCK_IRQ if !PREEMPT
 +      select ARCH_INLINE_WRITE_LOCK_IRQSAVE if !PREEMPT
 +      select ARCH_INLINE_WRITE_UNLOCK if !PREEMPT
 +      select ARCH_INLINE_WRITE_UNLOCK_BH if !PREEMPT
 +      select ARCH_INLINE_WRITE_UNLOCK_IRQ if !PREEMPT
 +      select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE if !PREEMPT
        select ARCH_USE_CMPXCHG_LOCKREF
 +      select ARCH_USE_QUEUED_RWLOCKS
        select ARCH_SUPPORTS_MEMORY_FAILURE
        select ARCH_SUPPORTS_ATOMIC_RMW
        select ARCH_SUPPORTS_NUMA_BALANCING
@@@ -556,25 -539,6 +556,25 @@@ config QCOM_QDF2400_ERRATUM_006
  
          If unsure, say Y.
  
 +
 +config SOCIONEXT_SYNQUACER_PREITS
 +      bool "Socionext Synquacer: Workaround for GICv3 pre-ITS"
 +      default y
 +      help
 +        Socionext Synquacer SoCs implement a separate h/w block to generate
 +        MSI doorbell writes with non-zero values for the device ID.
 +
 +        If unsure, say Y.
 +
 +config HISILICON_ERRATUM_161600802
 +      bool "Hip07 161600802: Erroneous redistributor VLPI base"
 +      default y
 +      help
 +        The HiSilicon Hip07 SoC usees the wrong redistributor base
 +        when issued ITS commands such as VMOVP and VMAPP, and requires
 +        a 128kB offset to be applied to the target address in this commands.
 +
 +        If unsure, say Y.
  endmenu
  
  
@@@ -982,7 -946,7 +982,7 @@@ config ARM64_UA
        help
          User Access Override (UAO; part of the ARMv8.2 Extensions)
          causes the 'unprivileged' variant of the load/store instructions to
-         be overriden to be privileged.
+         be overridden to be privileged.
  
          This option changes get_user() and friends to use the 'unprivileged'
          variant of the load/store instructions. This ensures that user-space

diff --combined arch/powerpc/platforms/Kconfig
index d5e34ce,aac89f5..5a96a27
--- 1/arch/powerpc/platforms/Kconfig
--- 2/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@@ -1,4 -1,3 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0
  menu "Platform support"
  
  source "arch/powerpc/platforms/powernv/Kconfig"
@@@ -79,7 -78,7 +79,7 @@@ config UDBG_RTAS_CONSOL
  config PPC_SMP_MUXED_IPI
        bool
        help
-         Select this opton if your platform supports SMP and your
+         Select this option if your platform supports SMP and your
          interrupt controller provides less than 4 interrupts to each
          cpu.  This will enable the generic code to multiplex the 4
          messages on to one ipi.

diff --combined arch/unicore32/Kconfig
index d39f0bc,ac4c472..462e59a
--- 1/arch/unicore32/Kconfig
--- 2/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@@ -1,4 -1,3 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0
  config UNICORE32
        def_bool y
        select ARCH_HAS_DEVMEM_IS_ALLOWED
@@@ -115,7 -114,7 +115,7 @@@ endi
  
  source "arch/unicore32/mm/Kconfig"
  
- comment "Floating poing support"
+ comment "Floating point support"
  
  config UNICORE_FPU_F64
        def_bool y if !ARCH_FPGA

diff --combined arch/xtensa/Kconfig
index eb1f196,7c3694c..8bc52f7
--- 1/arch/xtensa/Kconfig
--- 2/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -1,4 -1,3 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0
  config ZONE_DMA
        def_bool y
  
@@@ -224,7 -223,7 +224,7 @@@ config INITIALIZE_XTENSA_MMU_INSIDE_VML
          then enter your normal kernel breakpoints once the MMU was mapped
          to the kernel mappings (0XC0000000).
  
-         This unfortunately doesn't work for U-Boot and likley also wont
+         This unfortunately won't work for U-Boot and likely also wont
          work for using KEXEC to have a hot kernel ready for doing a
          KDUMP.
  

diff --combined drivers/power/supply/Kconfig
index fbca0ba,382669b..428b426
--- 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 --combined drivers/scsi/Kconfig
index 7669553,2b1cd30..8a739b7
--- 1/drivers/scsi/Kconfig
--- 2/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@@ -130,8 -130,7 +130,8 @@@ config CHR_DEV_OSS
  
  config BLK_DEV_SR
        tristate "SCSI CDROM support"
 -      depends on SCSI
 +      depends on SCSI && BLK_DEV
 +      select CDROM
        ---help---
          If you want to use a CD or DVD drive attached to your computer
          by SCSI, FireWire, USB or ATAPI, say Y and read the SCSI-HOWTO
@@@ -787,7 -786,7 +787,7 @@@ config SCSI_IBMVSCSI
        depends on PPC_PSERIES && TARGET_CORE && SCSI && PCI
        help
          This is the IBM POWER Virtual SCSI Target Server
-         This driver uses the SRP protocol for communication betwen servers
+         This driver uses the SRP protocol for communication between servers
          guest and/or the host that run on the same server.
          More information on VSCSI protocol can be found at www.power.org
  

diff --combined init/Kconfig
index c1fd286,3aef23a..2431e05
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -472,13 -472,6 +472,13 @@@ config TASK_IO_ACCOUNTIN
  
  endmenu # "CPU/Task time and stats accounting"
  
 +config CPU_ISOLATION
 +      bool "CPU isolation"
 +      help
 +        Make sure that CPUs running critical tasks are not disturbed by
 +        any source of "noise" such as unbound workqueues, timers, kthreads...
 +        Unbound jobs get offloaded to housekeeping CPUs.
 +
  source "kernel/rcu/Kconfig"
  
  config BUILD_BIN2C
@@@ -1040,7 -1033,7 +1040,7 @@@ endi
  
  choice
        prompt "Compiler optimization level"
 -      default CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
 +      default CC_OPTIMIZE_FOR_PERFORMANCE
  
  config CC_OPTIMIZE_FOR_PERFORMANCE
        bool "Optimize for performance"
@@@ -1759,7 -1752,7 +1759,7 @@@ config MODULE_SI
        help
          Check modules for valid signatures upon load: the signature
          is simply appended to the module. For more information see
-         Documentation/module-signing.txt.
+         <file:Documentation/admin-guide/module-signing.rst>.
  
          Note that this option adds the OpenSSL development packages as a
          kernel build dependency so that the signing tool can use its crypto

diff --combined mm/huge_memory.c
index b521ed1,1e3541d..003f7bc
--- 1/mm/huge_memory.c
--- 2/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@@ -39,10 -39,10 +39,10 @@@
  #include "internal.h"
  
  /*
-  * By default transparent hugepage support is disabled in order that avoid
-  * to risk increase the memory footprint of applications without a guaranteed
-  * benefit. When transparent hugepage support is enabled, is for all mappings,
-  * and khugepaged scans all mappings.
+  * By default, transparent hugepage support is disabled in order to avoid
+  * risking an increased memory footprint for applications that are not
+  * guaranteed to benefit from it. When transparent hugepage support is
+  * enabled, it is for all mappings, and khugepaged scans all mappings.
   * Defrag is invoked by khugepaged hugepage allocations and by page faults
   * for all hugepage allocations.
   */
@@@ -941,9 -941,6 +941,9 @@@ int copy_huge_pmd(struct mm_struct *dst
                                pmd = pmd_swp_mksoft_dirty(pmd);
                        set_pmd_at(src_mm, addr, src_pmd, pmd);
                }
 +              add_mm_counter(dst_mm, MM_ANONPAGES, HPAGE_PMD_NR);
 +              atomic_long_inc(&dst_mm->nr_ptes);
 +              pgtable_trans_huge_deposit(dst_mm, dst_pmd, pgtable);
                set_pmd_at(dst_mm, addr, dst_pmd, pmd);
                ret = 0;
                goto out_unlock;
@@@ -2718,7 -2715,7 +2718,7 @@@ static unsigned long deferred_split_cou
                struct shrink_control *sc)
  {
        struct pglist_data *pgdata = NODE_DATA(sc->nid);
 -      return ACCESS_ONCE(pgdata->split_queue_len);
 +      return READ_ONCE(pgdata->split_queue_len);
  }
  
  static unsigned long deferred_split_scan(struct shrinker *shrink,

diff --combined samples/trace_events/trace-events-sample.h
index 5bcd914,b385814..80b4a70
--- 1/samples/trace_events/trace-events-sample.h
--- 2/samples/trace_events/trace-events-sample.h
+++ b/samples/trace_events/trace-events-sample.h
@@@ -1,4 -1,3 +1,4 @@@
 +/* SPDX-License-Identifier: GPL-2.0 */
  /*
   * If TRACE_SYSTEM is defined, that will be the directory created
   * in the ftrace directory under /sys/kernel/tracing/events/<system>
@@@ -96,7 -95,7 +96,7 @@@
   *         __entry->bar.x = y;
  
   *   __array: There are three fields (type, name, size). The type is the
-  *         type of elements in teh array, the name is the name of the array.
+  *         type of elements in the array, the name is the name of the array.
   *         size is the number of items in the array (not the total size).
   *
   *         __array( char, foo, 10) is the same as saying: char foo[10];
@@@ -113,7 -112,7 +113,7 @@@
   *         type is the type of the element, name is the name of the array.
   *         The size is different than __array. It is not a static number,
   *         but the algorithm to figure out the length of the array for the
-  *         specific instance of tracepoint. Again, size is the numebr of
+  *         specific instance of tracepoint. Again, size is the number of
   *         items in the array, not the total length in bytes.
   *
   *         __dynamic_array( int, foo, bar) is similar to: int foo[bar];
@@@ -126,9 -125,9 +126,9 @@@
   *         Notice, that "__entry" is not needed here.
   *
   *   __string: This is a special kind of __dynamic_array. It expects to
-  *         have a nul terminated character array passed to it (it allows
+  *         have a null terminated character array passed to it (it allows
   *         for NULL too, which would be converted into "(null)"). __string
-  *         takes two paramenter (name, src), where name is the name of
+  *         takes two parameter (name, src), where name is the name of
   *         the string saved, and src is the string to copy into the
   *         ring buffer.
   *
@@@ -445,7 -444,7 +445,7 @@@ DECLARE_EVENT_CLASS(foo_template
  
  /*
   * Here's a better way for the previous samples (except, the first
-  * exmaple had more fields and could not be used here).
+  * example had more fields and could not be used here).
   */
  DEFINE_EVENT(foo_template, foo_with_template_simple,
        TP_PROTO(const char *foo, int bar),