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

Pull char/misc driver updates from Greg KH:
 "Here is the "big" char and misc driver patches for 4.18-rc1.

  It's not a lot of stuff here, but there are some highlights:

   - coreboot driver updates

   - soundwire driver updates

   - android binder updates

   - fpga big sync, mostly documentation

   - lots of minor driver updates

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (81 commits)
  vmw_balloon: fixing double free when batching mode is off
  MAINTAINERS: Add driver-api/fpga path
  fpga: clarify that unregister functions also free
  documentation: fpga: move fpga-region.txt to driver-api
  documentation: fpga: add bridge document to driver-api
  documentation: fpga: move fpga-mgr.txt to driver-api
  Documentation: fpga: move fpga overview to driver-api
  fpga: region: kernel-doc fixes
  fpga: bridge: kernel-doc fixes
  fpga: mgr: kernel-doc fixes
  fpga: use SPDX
  fpga: region: change api, add fpga_region_create/free
  fpga: bridge: change api, don't use drvdata
  fpga: manager: change api, don't use drvdata
  fpga: region: don't use drvdata in common fpga code
  Drivers: hv: vmbus: Removed an unnecessary cast from void *
  ver_linux: Drop redundant calls to system() to test if file is readable
  ver_linux: Move stderr redirection from function parameter to function body
  misc: IBM Virtual Management Channel Driver (VMC)
  rpmsg: Correct support for MODULE_DEVICE_TABLE()
  ...

diff --combined Documentation/driver-api/index.rst
index 5d04296f5ce043c9162e87a5d1e25568ae431c79,ed40ec090299659ee20d3b5a953f2a0a41b80803..f4180e7c7ed506be5b49389a1303dfb2a91a698a
--- 1/Documentation/driver-api/index.rst
--- 2/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@@ -17,9 -17,7 +17,9 @@@ available subsections can be seen below
     basics
     infrastructure
     pm/index
 +   clk
     device-io
 +   device_connection
     dma-buf
     device_link
     message-based
@@@ -51,6 -49,7 +51,7 @@@
     dmaengine/index
     slimbus
     soundwire/index
+    fpga/index
  
  .. only::  subproject and html
  

diff --combined Documentation/ioctl/ioctl-number.txt
index 27c1b7b78504d2bca13598013c6ff40e09f8926f,be8a98b9e6c4c1b4b96d5acd788f2368f7e8340d..a12488d45c40fb52e6b26c0757b9e72c8200e87a
--- 1/Documentation/ioctl/ioctl-number.txt
--- 2/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@@ -296,8 -296,7 +296,8 @@@ Code  Seq#(hex)    Include File            Comment
  0x90  00      drivers/cdrom/sbpcd.h
  0x92  00-0F   drivers/usb/mon/mon_bin.c
  0x93  60-7F   linux/auto_fs.h
 -0x94  all     fs/btrfs/ioctl.h
 +0x94  all     fs/btrfs/ioctl.h        Btrfs filesystem
 +              and linux/fs.h          some lifted to vfs/generic
  0x97  00-7F   fs/ceph/ioctl.h         Ceph file system
  0x99  00-0F                           537-Addinboard driver
                                        <mailto:[email protected]>
@@@ -328,6 -327,7 +328,7 @@@
  0xCA  80-BF   uapi/scsi/cxlflash_ioctl.h
  0xCB  00-1F   CBM serial IEC bus      in development:
                                        <mailto:[email protected]>
+ 0xCC  00-0F   drivers/misc/ibmvmc.h    pseries VMC driver
  0xCD  01      linux/reiserfs_fs.h
  0xCF  02      fs/cifs/ioctl.c
  0xDB  00-0F   drivers/char/mwave/mwavepub.h

diff --combined MAINTAINERS
index 756cbfaad7f942d9b04aef317bd6f2252e1365d2,225289367751d3470d184f85b5b71b3a0d984dfe..5c374d97c96743d78f86deb0dd513bc40d61511e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -137,9 -137,9 +137,9 @@@ Maintainers List (try to look for most 
                -----------------------------------
  
  3C59X NETWORK DRIVER
 -M:    Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
 +M:    Steffen Klassert <klassert@kernel.org>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/networking/vortex.txt
  F:    drivers/net/ethernet/3com/3c59x.c
  
@@@ -2331,16 -2331,8 +2331,16 @@@ S:    Maintaine
  F:    drivers/gpio/gpio-ath79.c
  F:    Documentation/devicetree/bindings/gpio/gpio-ath79.txt
  
 +ATHEROS 71XX/9XXX USB PHY DRIVER
 +M:    Alban Bedel <[email protected]>
 +W:    https://github.com/AlbanBedel/linux
 +T:    git git://github.com/AlbanBedel/linux
 +S:    Maintained
 +F:    drivers/phy/qualcomm/phy-ath79-usb.c
 +F:    Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
 +
  ATHEROS ATH GENERIC UTILITIES
 -M:    "Luis R. Rodriguez" <[email protected]>
 +M:    Kalle Valo <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/wireless/ath/*
@@@ -2355,7 -2347,7 +2355,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@qca.qualcomm.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@@ -2562,6 -2554,7 +2562,6 @@@ F:      Documentation/devicetree/bindings/so
  F:    sound/soc/atmel/tse850-pcm5142.c
  
  AZ6007 DVB DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -3090,6 -3083,7 +3090,6 @@@ F:      include/linux/btrfs
  F:    include/uapi/linux/btrfs*
  
  BTTV VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -3439,12 -3433,6 +3439,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
  F:    drivers/input/touchscreen/chipone_icn8318.c
  
 +CHIPONE ICN8505 I2C TOUCHSCREEN DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/input/touchscreen/chipone_icn8505.c
 +
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Benson Leung <[email protected]>
  M:    Olof Johansson <[email protected]>
@@@ -3705,6 -3693,7 +3705,6 @@@ F:      drivers/cpufreq/arm_big_little_dt.
  
  CPU POWER MONITORING SUBSYSTEM
  M:    Thomas Renninger <[email protected]>
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -3823,6 -3812,7 +3823,6 @@@ S:      Maintaine
  F:    drivers/media/dvb-frontends/cx24120*
  
  CX88 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -4323,7 -4313,7 +4323,7 @@@ F:      Documentation/driver-api/dma-buf.rs
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 -M:    Vinod Koul <v[email protected]>
 +M:    Vinod Koul <v[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Maintained
@@@ -4344,14 -4334,12 +4344,14 @@@ W:   http://git.infradead.org/users/hch/d
  S:    Supported
  F:    lib/dma-debug.c
  F:    lib/dma-direct.c
 +F:    lib/dma-noncoherent.c
  F:    lib/dma-virt.c
  F:    drivers/base/dma-mapping.c
  F:    drivers/base/dma-coherent.c
  F:    include/asm-generic/dma-mapping.h
  F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
 +F:    include/linux/dma-noncoherent.h
  
  DME1737 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <[email protected]>
@@@ -5065,6 -5053,7 +5065,6 @@@ F:      drivers/edac/thunderx_edac
  
  EDAC-CORE
  M:    Borislav Petkov <[email protected]>
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
@@@ -5093,6 -5082,7 +5093,6 @@@ S:      Maintaine
  F:    drivers/edac/fsl_ddr_edac.*
  
  EDAC-GHES
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5109,18 -5099,21 +5109,18 @@@ S:   Maintaine
  F:    drivers/edac/i5000_edac.c
  
  EDAC-I5400
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
  EDAC-I7300
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/i7300_edac.c
  
  EDAC-I7CORE
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5170,6 -5163,7 +5170,6 @@@ S:      Maintaine
  F:    drivers/edac/r82600_edac.c
  
  EDAC-SBRIDGE
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5228,6 -5222,7 +5228,6 @@@ S:      Maintaine
  F:    drivers/net/ethernet/ibm/ehea/
  
  EM28XX VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -5404,6 -5399,7 +5404,6 @@@ S:      Maintaine
  F:    drivers/iommu/exynos-iommu.c
  
  EZchip NPS platform support
 -M:    Elad Kanfi <[email protected]>
  M:    Vineet Gupta <[email protected]>
  S:    Supported
  F:    arch/arc/plat-eznps
@@@ -5429,11 -5425,6 +5429,11 @@@ S:    Maintaine
  F:    Documentation/hwmon/f71805f
  F:    drivers/hwmon/f71805f.c
  
 +FADDR2LINE
 +M:    Josh Poimboeuf <[email protected]>
 +S:    Maintained
 +F:    scripts/faddr2line
 +
  FANOTIFY
  M:    Jan Kara <[email protected]>
  R:    Amir Goldstein <[email protected]>
@@@ -5586,6 -5577,7 +5586,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  F:    Documentation/fpga/
+ F:    Documentation/driver-api/fpga/
  F:    Documentation/devicetree/bindings/fpga/
  F:    drivers/fpga/
  F:    include/linux/fpga/
@@@ -5969,8 -5961,8 +5970,8 @@@ S:      Maintaine
  F:    scripts/get_maintainer.pl
  
  GFS2 FILE SYSTEM
 -M:    Steven Whitehouse <[email protected]>
  M:    Bob Peterson <[email protected]>
 +M:    Andreas Gruenbacher <[email protected]>
  L:    [email protected]
  W:    http://sources.redhat.com/cluster/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
@@@ -6238,7 -6230,6 +6239,7 @@@ L:      [email protected]
  W:    http://hwmon.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/
  F:    Documentation/hwmon/
  F:    drivers/hwmon/
  F:    include/linux/hwmon*.h
@@@ -6525,15 -6516,9 +6526,15 @@@ F:    Documentation/networking/hinic.tx
  F:    drivers/net/ethernet/huawei/hinic/
  
  HUGETLB FILESYSTEM
 -M:    Nadia Yvette Chambers <[email protected]>
 +M:    Mike Kravetz <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    fs/hugetlbfs/
 +F:    mm/hugetlb.c
 +F:    include/linux/hugetlb.h
 +F:    Documentation/admin-guide/mm/hugetlbpage.rst
 +F:    Documentation/vm/hugetlbfs_reserv.rst
 +F:    Documentation/ABI/testing/sysfs-kernel-mm-hugepages
  
  HVA ST MEDIA DRIVER
  M:    Jean-Christophe Trotin <[email protected]>
@@@ -6773,6 -6758,12 +6774,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvfc*
  
+ IBM Power Virtual Management Channel Driver
+ M:    Bryant G. Ly <[email protected]>
+ M:    Steven Royer <[email protected]>
+ S:    Supported
+ F:    drivers/misc/ibmvmc.*
+ 
  IBM Power Virtual SCSI Device Drivers
  M:    Tyrel Datwyler <[email protected]>
  L:    [email protected]
@@@ -7693,11 -7684,9 +7700,11 @@@ L:    [email protected]
  S:    Maintained
  F:    Documentation/kbuild/
  F:    Makefile
 -F:    scripts/Makefile.*
 +F:    scripts/Kbuild*
 +F:    scripts/Makefile*
  F:    scripts/basic/
  F:    scripts/mk*
 +F:    scripts/mod/
  F:    scripts/package/
  
  KERNEL JANITORS
@@@ -7722,10 -7711,10 +7729,10 @@@ F:   include/linux/sunrpc
  F:    include/uapi/linux/sunrpc/
  
  KERNEL SELFTEST FRAMEWORK
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
 +Q:    https://patchwork.kernel.org/project/linux-kselftest/list/
  S:    Maintained
  F:    tools/testing/selftests/
  F:    Documentation/dev-tools/kselftest*
@@@ -8231,7 -8220,7 +8238,7 @@@ F:      drivers/misc/lkdtm/
  
  LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
  M:    Alan Stern <[email protected]>
 -M:    Andrea Parri <parri.andrea@gmail.com>
 +M:    Andrea Parri <andrea.parri@amarulasolutions.com>
  M:    Will Deacon <[email protected]>
  M:    Peter Zijlstra <[email protected]>
  M:    Boqun Feng <[email protected]>
@@@ -8338,7 -8327,6 +8345,7 @@@ F:      Documentation/admin-guide/LSM/LoadPi
  LOCKING PRIMITIVES
  M:    Peter Zijlstra <[email protected]>
  M:    Ingo Molnar <[email protected]>
 +M:    Will Deacon <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
  S:    Maintained
@@@ -8890,6 -8878,7 +8897,6 @@@ F:      Documentation/devicetree/bindings/me
  F:    drivers/staging/media/tegra-vde/
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  P:    LinuxTV.org Project
  L:    [email protected]
@@@ -9049,6 -9038,7 +9056,6 @@@ Q:      http://patchwork.ozlabs.org/project/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
  
  MELLANOX ETHERNET INNOVA DRIVER
 -M:    Ilan Tayari <[email protected]>
  R:    Boris Pismenny <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -9058,6 -9048,7 +9065,6 @@@ F:      drivers/net/ethernet/mellanox/mlx5/c
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
  
  MELLANOX ETHERNET INNOVA IPSEC DRIVER
 -M:    Ilan Tayari <[email protected]>
  R:    Boris Pismenny <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -9113,6 -9104,7 +9120,6 @@@ F:      include/uapi/rdma/mlx4-abi.
  
  MELLANOX MLX5 core VPI driver
  M:    Saeed Mahameed <[email protected]>
 -M:    Matan Barak <[email protected]>
  M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -9123,6 -9115,7 +9130,6 @@@ F:      drivers/net/ethernet/mellanox/mlx5/c
  F:    include/linux/mlx5/
  
  MELLANOX MLX5 IB driver
 -M:    Matan Barak <[email protected]>
  M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
  W:    http://www.mellanox.com
@@@ -9723,7 -9716,7 +9730,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/netronome/
  
  NETWORK BLOCK DEVICE (NBD)
 -M:    Josef Bacik <jbacik@fb.com>
 +M:    Josef Bacik <josef@toxicpanda.com>
  S:    Maintained
  L:    [email protected]
  L:    [email protected]
@@@ -9739,7 -9732,6 +9746,7 @@@ W:      https://fedorahosted.org/dropwatch
  F:    net/core/drop_monitor.c
  
  NETWORKING DRIVERS
 +M:    "David S. Miller" <[email protected]>
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
@@@ -9856,6 -9848,7 +9863,6 @@@ F:      net/netfilter/xt_CONNSECMARK.
  F:    net/netfilter/xt_SECMARK.c
  
  NETWORKING [TLS]
 -M:    Ilya Lesokhin <[email protected]>
  M:    Aviad Yehezkel <[email protected]>
  M:    Dave Watson <[email protected]>
  L:    [email protected]
@@@ -9895,7 -9888,7 +9902,7 @@@ F:      include/linux/platform_data/nxp-nci.
  F:    Documentation/devicetree/bindings/net/nfc/
  
  NFS, SUNRPC, AND LOCKD CLIENTS
 -M:    Trond Myklebust <trond.myklebust@primarydata.com>
 +M:    Trond Myklebust <trond.myklebust@hammerspace.com>
  M:    Anna Schumaker <[email protected]>
  L:    [email protected]
  W:    http://client.linux-nfs.org
@@@ -11275,7 -11268,6 +11282,7 @@@ M:   Sebastian Reichel <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-power
  F:    Documentation/devicetree/bindings/power/supply/
  F:    include/linux/power_supply.h
  F:    drivers/power/supply/
@@@ -11656,7 -11648,7 +11663,7 @@@ S:   Maintaine
  F:    drivers/media/tuners/qt1010*
  
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@qca.qualcomm.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ath10k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@@ -11678,13 -11670,6 +11685,13 @@@ F: Documentation/devicetree/bindings/me
  F:    Documentation/media/v4l-drivers/qcom_camss.rst
  F:    drivers/media/platform/qcom/camss-8x16/
  
 +QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 +M:  Ilia Lin <[email protected]>
 +L:  [email protected]
 +S:  Maintained
 +F:  Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
 +F:  drivers/cpufreq/qcom-cpufreq-kryo.c
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <[email protected]>
  L:    [email protected]
@@@ -11714,7 -11699,7 +11721,7 @@@ S:   Maintaine
  F:    drivers/media/platform/qcom/venus/
  
  QUALCOMM WCN36XX WIRELESS DRIVER
 -M:    Eugene Krasnikov <[email protected]>
 +M:    Kalle Valo <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/wcn36xx
  T:    git git://github.com/KrasnikovEugene/wcn36xx.git
@@@ -12252,7 -12237,7 +12259,7 @@@ F:   Documentation/s390/vfio-ccw.tx
  F:    include/uapi/linux/vfio_ccw.h
  
  S390 ZCRYPT DRIVER
 -M:    Harald Freudenberger <freude@de.ibm.com>
 +M:    Harald Freudenberger <freude@linux.ibm.com>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -12281,6 -12266,7 +12288,6 @@@ S:   Odd Fixe
  F:    drivers/media/i2c/saa6588*
  
  SAA7134 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -12519,7 -12505,6 +12526,7 @@@ F:   drivers/scsi/st_*.
  SCTP PROTOCOL
  M:    Vlad Yasevich <[email protected]>
  M:    Neil Horman <[email protected]>
 +M:    Marcelo Ricardo Leitner <[email protected]>
  L:    [email protected]
  W:    http://lksctp.sourceforge.net
  S:    Maintained
@@@ -12785,6 -12770,7 +12792,6 @@@ S:   Maintaine
  F:    drivers/media/radio/si4713/radio-usb-si4713.c
  
  SIANO DVB DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13136,7 -13122,7 +13143,7 @@@ F:   include/uapi/sound
  F:    sound/
  
  SOUND - COMPRESSED AUDIO
- M:    Vinod Koul <v[email protected]>
+ M:    Vinod Koul <v[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Supported
@@@ -13296,12 -13282,6 +13303,12 @@@ M: Jan-Benedict Glaw <[email protected]
  S:    Maintained
  F:    arch/alpha/kernel/srm_env.c
  
 +ST STM32 I2C/SMBUS DRIVER
 +M:    Pierre-Yves MORDRET <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-stm32*
 +
  STABLE BRANCH
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -13781,6 -13761,7 +13788,6 @@@ S:   Maintaine
  F:    drivers/media/i2c/tda9840*
  
  TEA5761 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13789,6 -13770,7 +13796,6 @@@ S:   Odd fixe
  F:    drivers/media/tuners/tea5761.*
  
  TEA5767 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -13878,6 -13860,7 +13885,6 @@@ S:   Supporte
  F:    drivers/iommu/tegra*
  
  TEGRA KBC DRIVER
 -M:    Rakesh Iyer <[email protected]>
  M:    Laxman Dewangan <[email protected]>
  S:    Supported
  F:    drivers/input/keyboard/tegra-kbc.c
@@@ -14204,6 -14187,7 +14211,6 @@@ F:   Documentation/networking/tlan.tx
  F:    drivers/net/ethernet/ti/tlan.*
  
  TM6000 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -14402,15 -14386,6 +14409,15 @@@ S: Maintaine
  F:    drivers/tc/
  F:    include/linux/tc.h
  
 +TURBOSTAT UTILITY
 +M:    "Len Brown" <[email protected]>
 +L:    [email protected]
 +B:    https://bugzilla.kernel.org
 +Q:    https://patchwork.kernel.org/project/linux-pm/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat
 +S:    Supported
 +F:    tools/power/x86/turbostat/
 +
  TW5864 VIDEO4LINUX DRIVER
  M:    Bluecherry Maintainers <[email protected]>
  M:    Anton Sviridenko <[email protected]>
@@@ -14695,13 -14670,13 +14702,13 @@@ F:        drivers/usb/common/usb-otg-fsm.
  
  USB OVER IP DRIVER
  M:    Valentina Manea <[email protected]>
 -M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/usb/usbip_protocol.txt
  F:    drivers/usb/usbip/
  F:    tools/usb/usbip/
 +F:    tools/testing/selftests/drivers/usb/usbip/
  
  USB PEGASUS DRIVER
  M:    Petko Manolov <[email protected]>
@@@ -15439,6 -15414,7 +15446,6 @@@ S:   Maintaine
  F:    arch/x86/entry/vdso/
  
  XC2028/3028 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
@@@ -15554,14 -15530,6 +15561,14 @@@ L: [email protected]
  S:    Supported
  F:    drivers/char/xillybus/
  
 +XLP9XX I2C DRIVER
 +M:    George Cherian <[email protected]>
 +M:    Jan Glauber <[email protected]>
 +L:    [email protected]
 +W:    http://www.cavium.com
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-xlp9xx.c
 +
  XRA1403 GPIO EXPANDER
  M:    Nandor Han <[email protected]>
  M:    Semi Malinen <[email protected]>
@@@ -15680,7 -15648,7 +15687,7 @@@ L:   [email protected]
  S:    Maintained
  F:    mm/zsmalloc.c
  F:    include/linux/zsmalloc.h
 -F:    Documentation/vm/zsmalloc.txt
 +F:    Documentation/vm/zsmalloc.rst
  
  ZSWAP COMPRESSED SWAP CACHING
  M:    Seth Jennings <[email protected]>

diff --combined drivers/amba/bus.c
index 0cf51d57e4ae8782fcb737c2056795939d709584,842314a439fdd4ebfee94263941d758d07c77ff6..3ece711a6a178624c925f3e008fe4db8dabf9d1d
--- 1/drivers/amba/bus.c
--- 2/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@@ -20,7 -20,6 +20,7 @@@
  #include <linux/sizes.h>
  #include <linux/limits.h>
  #include <linux/clk/clk-conf.h>
 +#include <linux/platform_device.h>
  
  #include <asm/irq.h>
  
@@@ -102,8 -101,8 +102,8 @@@ static ssize_t driver_override_store(st
        if (strlen(driver_override)) {
                dev->driver_override = driver_override;
        } else {
-              kfree(driver_override);
-              dev->driver_override = NULL;
+               kfree(driver_override);
+               dev->driver_override = NULL;
        }
        device_unlock(_dev);
  
@@@ -194,16 -193,14 +194,16 @@@ static const struct dev_pm_ops amba_pm 
  /*
   * Primecells are part of the Advanced Microcontroller Bus Architecture,
   * so we call the bus "amba".
 + * DMA configuration for platform and AMBA bus is same. So here we reuse
 + * platform's DMA config routine.
   */
  struct bus_type amba_bustype = {
        .name           = "amba",
        .dev_groups     = amba_dev_groups,
        .match          = amba_match,
        .uevent         = amba_uevent,
 +      .dma_configure  = platform_dma_configure,
        .pm             = &amba_pm,
 -      .force_dma      = true,
  };
  
  static int __init amba_init(void)
@@@ -251,7 -248,7 +251,7 @@@ static int amba_probe(struct device *de
                        break;
  
                ret = dev_pm_domain_attach(dev, true);
 -              if (ret == -EPROBE_DEFER)
 +              if (ret)
                        break;
  
                ret = amba_get_enable_pclk(pcdev);
@@@ -378,7 -375,7 +378,7 @@@ static int amba_device_try_add(struct a
        }
  
        ret = dev_pm_domain_attach(&dev->dev, true);
 -      if (ret == -EPROBE_DEFER) {
 +      if (ret) {
                iounmap(tmp);
                goto err_release;
        }