Merge 5.2-rc3 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/accel/kxsd9-spi.c
index 3027917,011aeff..7971ec1
--- 1/drivers/iio/accel/kxsd9-spi.c
--- 2/drivers/iio/accel/kxsd9-spi.c
+++ b/drivers/iio/accel/kxsd9-spi.c
@@@ -1,7 -1,6 +1,8 @@@
+ // SPDX-License-Identifier: GPL-2.0-only
  #include <linux/device.h>
  #include <linux/kernel.h>
 +#include <linux/of.h>
 +#include <linux/of_device.h>
  #include <linux/spi/spi.h>
  #include <linux/module.h>
  #include <linux/slab.h>

diff --cc drivers/iio/adc/at91_adc.c
Simple merge

diff --cc drivers/iio/adc/mt6577_auxadc.c
Simple merge

diff --cc drivers/iio/dac/ds4424.c
Simple merge

diff --cc drivers/iio/frequency/ad9523.c
Simple merge

diff --cc drivers/staging/kpc2000/Kconfig
Simple merge

diff --cc drivers/staging/kpc2000/kpc_dma/fileops.c
index 7b17362,6166587..aec6038
--- 1/drivers/staging/kpc2000/kpc_dma/fileops.c
--- 2/drivers/staging/kpc2000/kpc_dma/fileops.c
+++ b/drivers/staging/kpc2000/kpc_dma/fileops.c
@@@ -112,16 -113,14 +112,14 @@@ int  kpc_dma_transfer(struct dev_privat
        // Figoure out how many descriptors are available and return an error if there aren't enough
        num_descrs_avail = count_descriptors_available(ldev);
        dev_dbg(&priv->ldev->pldev->dev, "    mapped_entry_count = %d    num_descrs_needed = %d    num_descrs_avail = %d\n", acd->mapped_entry_count, desc_needed, num_descrs_avail);
 -      if (desc_needed >= ldev->desc_pool_cnt){
 +      if (desc_needed >= ldev->desc_pool_cnt) {
                dev_warn(&priv->ldev->pldev->dev, "    mapped_entry_count = %d    num_descrs_needed = %d    num_descrs_avail = %d    TOO MANY to ever complete!\n", acd->mapped_entry_count, desc_needed, num_descrs_avail);
                rv = -EAGAIN;
-               unlock_engine(ldev);
                goto err_descr_too_many;
        }
 -      if (desc_needed > num_descrs_avail){
 +      if (desc_needed > num_descrs_avail) {
                dev_warn(&priv->ldev->pldev->dev, "    mapped_entry_count = %d    num_descrs_needed = %d    num_descrs_avail = %d    Too many to complete right now.\n", acd->mapped_entry_count, desc_needed, num_descrs_avail);
                rv = -EMSGSIZE;
-               unlock_engine(ldev);
                goto err_descr_too_many;
        }
  

diff --cc drivers/staging/vc04_services/bcm2835-camera/controls.c
Simple merge

diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
Simple merge

diff --cc drivers/staging/wilc1000/wilc_wlan.c
Simple merge