Merge tag 'char-misc-4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

Pull char/misc driver fixes from Greg KH:
 "Here are some small driver fixes for 4.12-rc5. Nothing major here,
  just some small bugfixes found by people testing, and a MAINTAINERS
  file update for the genwqe driver.

  All have been in linux-next with no reported issues"

[ The cxl driver fix came in through the powerpc tree earlier ]

* tag 'char-misc-4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  cxl: Avoid double free_irq() for psl,slice interrupts
  mei: make sysfs modalias format similar as uevent modalias
  drivers: char: mem: Fix wraparound check to allow mappings up to the end
  MAINTAINERS: Change maintainer of genwqe driver
  goldfish_pipe: use GFP_ATOMIC under spin lock
  firmware: vpd: do not leak kobjects
  firmware: vpd: avoid potential use-after-free when destroying section
  firmware: vpd: do not leave freed section attributes to the list

diff --combined MAINTAINERS
index 4d8e525b84eeb876cd61235e86ea76f01c1455e2,4ee8967a1e4a18f3b2b4f7be1647c15900dc02df..64d72f49e905ab061e08e8297778213d8552a1ef
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1172,7 -1172,7 +1172,7 @@@ N:      clps711
  
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
 -M:    Ryan Mallon <rmallon@gmail.com>
 +M:    Alexander Sverdlin <alexander.sverdlin@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-ep93xx/
@@@ -1489,15 -1489,13 +1489,15 @@@ M:   Gregory Clement <gregory.clement@fre
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    arch/arm/mach-mvebu/
 -F:    drivers/rtc/rtc-armada38x.c
  F:    arch/arm/boot/dts/armada*
  F:    arch/arm/boot/dts/kirkwood*
 +F:    arch/arm/configs/mvebu_*_defconfig
 +F:    arch/arm/mach-mvebu/
  F:    arch/arm64/boot/dts/marvell/armada*
  F:    drivers/cpufreq/mvebu-cpufreq.c
 -F:    arch/arm/configs/mvebu_*_defconfig
 +F:    drivers/irqchip/irq-armada-370-xp.c
 +F:    drivers/irqchip/irq-mvebu-*
 +F:    drivers/rtc/rtc-armada38x.c
  
  ARM/Marvell Berlin SoC support
  M:    Jisheng Zhang <jszhang@marvell.com>
@@@ -1723,6 -1721,7 +1723,6 @@@ N:      rockchi
  ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
  M:    Kukjin Kim <kgene@kernel.org>
  M:    Krzysztof Kozlowski <krzk@kernel.org>
 -R:    Javier Martinez Canillas <javier@osg.samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
@@@ -1830,6 -1829,7 +1830,6 @@@ F:      drivers/edac/altera_edac
  ARM/STI ARCHITECTURE
  M:    Patrice Chotard <patrice.chotard@st.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    kernel@stlinux.com
  W:    http://www.stlinux.com
  S:    Maintained
  F:    arch/arm/mach-sti/
@@@ -5622,7 -5622,7 +5622,7 @@@ F:      scripts/get_maintainer.p
  
  GENWQE (IBM Generic Workqueue Card)
  M:    Frank Haverkamp <haver@linux.vnet.ibm.com>
- M:    Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
+ M:    Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
  S:    Supported
  F:    drivers/misc/genwqe/
  
@@@ -7143,7 -7143,7 +7143,7 @@@ S:      Maintaine
  F:    drivers/media/platform/rcar_jpu.c
  
  JSM Neo PCI based serial card
 -M:    Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
 +M:    Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
  F:    drivers/tty/serial/jsm/
@@@ -7707,7 -7707,7 +7707,7 @@@ F:      drivers/platform/x86/hp_accel.
  
  LIVE PATCHING
  M:    Josh Poimboeuf <jpoimboe@redhat.com>
 -M:    Jessica Yu <jeyu@redhat.com>
 +M:    Jessica Yu <jeyu@kernel.org>
  M:    Jiri Kosina <jikos@kernel.org>
  M:    Miroslav Benes <mbenes@suse.cz>
  R:    Petr Mladek <pmladek@suse.com>
@@@ -8508,7 -8508,7 +8508,7 @@@ S:      Odd Fixe
  F:    drivers/media/radio/radio-miropcm20*
  
  MELLANOX MLX4 core VPI driver
 -M:    Yishai Hadas <yishaih@mellanox.com>
 +M:    Tariq Toukan <tariqt@mellanox.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
@@@ -8516,6 -8516,7 +8516,6 @@@ Q:      http://patchwork.ozlabs.org/project/
  S:    Supported
  F:    drivers/net/ethernet/mellanox/mlx4/
  F:    include/linux/mlx4/
 -F:    include/uapi/rdma/mlx4-abi.h
  
  MELLANOX MLX4 IB driver
  M:    Yishai Hadas <yishaih@mellanox.com>
@@@ -8525,7 -8526,6 +8525,7 @@@ Q:      http://patchwork.kernel.org/project/
  S:    Supported
  F:    drivers/infiniband/hw/mlx4/
  F:    include/linux/mlx4/
 +F:    include/uapi/rdma/mlx4-abi.h
  
  MELLANOX MLX5 core VPI driver
  M:    Saeed Mahameed <saeedm@mellanox.com>
@@@ -8538,6 -8538,7 +8538,6 @@@ Q:      http://patchwork.ozlabs.org/project/
  S:    Supported
  F:    drivers/net/ethernet/mellanox/mlx5/core/
  F:    include/linux/mlx5/
 -F:    include/uapi/rdma/mlx5-abi.h
  
  MELLANOX MLX5 IB driver
  M:    Matan Barak <matanb@mellanox.com>
@@@ -8548,7 -8549,6 +8548,7 @@@ Q:      http://patchwork.kernel.org/project/
  S:    Supported
  F:    drivers/infiniband/hw/mlx5/
  F:    include/linux/mlx5/
 +F:    include/uapi/rdma/mlx5-abi.h
  
  MELEXIS MLX90614 DRIVER
  M:    Crt Mori <cmo@melexis.com>
@@@ -8588,7 -8588,7 +8588,7 @@@ S:      Maintaine
  F:    drivers/media/dvb-frontends/mn88473*
  
  MODULE SUPPORT
 -M:    Jessica Yu <jeyu@redhat.com>
 +M:    Jessica Yu <jeyu@kernel.org>
  M:    Rusty Russell <rusty@rustcorp.com.au>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
  S:    Maintained
@@@ -10450,7 -10450,7 +10450,7 @@@ S:   Orpha
  
  PXA RTC DRIVER
  M:    Robert Jarzmik <robert.jarzmik@free.fr>
 -L:    rtc-linux@googlegroups.com
 +L:    linux-rtc@vger.kernel.org
  S:    Maintained
  
  QAT DRIVER
@@@ -10757,7 -10757,7 +10757,7 @@@ X:   kernel/torture.
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>
  M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
 -L:    rtc-linux@googlegroups.com
 +L:    linux-rtc@vger.kernel.org
  Q:    http://patchwork.ozlabs.org/project/rtc-linux/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
  S:    Maintained
@@@ -11268,6 -11268,7 +11268,6 @@@ F:   drivers/media/rc/serial_ir.
  
  STI CEC DRIVER
  M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 -L:    kernel@stlinux.com
  S:    Maintained
  F:    drivers/staging/media/st-cec/
  F:    Documentation/devicetree/bindings/media/stih-cec.txt
@@@ -11777,7 -11778,6 +11777,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    arch/arm/mach-davinci/
  F:    drivers/i2c/busses/i2c-davinci.c
 +F:    arch/arm/boot/dts/da850*
  
  TI DAVINCI SERIES MEDIA DRIVER
  M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
@@@ -13861,7 -13861,7 +13861,7 @@@ S:   Odd fixe
  F:    drivers/net/wireless/wl3501*
  
  WOLFSON MICROELECTRONICS DRIVERS
 -L:    patches@opensource.wolfsonmicro.com
 +L:    patches@opensource.cirrus.com
  T:    git https://github.com/CirrusLogic/linux-drivers.git
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
  S:    Supported