Merge 4.19-rc4 into staging-next

Handle the merge issues and take the iio and staging driver fixes.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --cc MAINTAINERS
index 1e3e0dfe448a58681a35ea8eea0cd02dfb8c428e,4ece30f15777cecaf93bc2c362427ca4f46ad96e..7f77f2c837a82b1a725eda9ed435bf4ecd90a450
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5632,7 -5624,10 +5633,9 @@@ F:     Documentation/fault-injection
  F:    lib/fault-inject.c
  
  FBTFT Framebuffer drivers
 -M:    Thomas Petazzoni <[email protected]>
 +S:    Orphan
+ L:    [email protected]
+ L:    [email protected]
 -S:    Maintained
  F:    drivers/staging/fbtft/
  
  FC0011 TUNER DRIVER

diff --cc drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
Simple merge

diff --cc drivers/staging/erofs/super.c
Simple merge

diff --cc drivers/staging/wilc1000/linux_wlan.c
index 1d8de4dc9cf909471e9003107e3ca098404752ce,3b8d237decbf179b7016242583909fc46146c99c..49afda669393c3a14b836c9a39563fb66814c318
--- 1/drivers/staging/wilc1000/linux_wlan.c
--- 2/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@@ -1039,11 -1037,9 +1039,11 @@@ void wilc_netdev_cleanup(struct wilc *w
                }
        }
  
 +      flush_workqueue(wilc->hif_workqueue);
 +      destroy_workqueue(wilc->hif_workqueue);
        kfree(wilc);
-       wilc_debugfs_remove();
  }
+ EXPORT_SYMBOL_GPL(wilc_netdev_cleanup);
  
  static const struct net_device_ops wilc_netdev_ops = {
        .ndo_init = mac_init_fn,
@@@ -1131,22 -1122,7 +1130,25 @@@ int wilc_netdev_init(struct wilc **wilc
        }
  
        return 0;
 +
 +free_ndev:
 +      for (; i >= 0; i--) {
 +              if (wl->vif[i]) {
 +                      if (wl->vif[i]->iftype == STATION_MODE)
 +                              unregister_netdev(wl->vif[i]->ndev);
 +
 +                      if (wl->vif[i]->ndev) {
 +                              wilc_free_wiphy(wl->vif[i]->ndev);
 +                              free_netdev(wl->vif[i]->ndev);
 +                      }
 +              }
 +      }
 +      unregister_inetaddr_notifier(&g_dev_notifier);
 +      destroy_workqueue(wl->hif_workqueue);
 +free_wl:
 +      kfree(wl);
 +      return -ENOMEM;
  }
+ EXPORT_SYMBOL_GPL(wilc_netdev_init);
+ 
+ MODULE_LICENSE("GPL");

diff --cc drivers/staging/wilc1000/wilc_wlan.c
index 6ff3e586143140338ec471d976332fd435e22f5f,8b184aa30d25d958dab26ddd1adc73583965debd..590a51c52fd0981675548396dd30371dc64e20e0
--- 1/drivers/staging/wilc1000/wilc_wlan.c
--- 2/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@@ -455,8 -470,9 +456,9 @@@ void chip_wakeup(struct wilc *wilc
                        wilc->hif_func->hif_write_reg(wilc, 0x1e9c, val32);
                }
        }
 -      chip_ps_state = CHIP_WAKEDUP;
 +      wilc->chip_ps_state = CHIP_WAKEDUP;
  }
+ EXPORT_SYMBOL_GPL(chip_wakeup);
  
  void wilc_chip_sleep_manually(struct wilc *wilc)
  {
@@@ -467,9 -483,10 +469,10 @@@
        chip_allow_sleep(wilc);
        wilc->hif_func->hif_write_reg(wilc, 0x10a8, 1);
  
 -      chip_ps_state = CHIP_SLEEPING_MANUAL;
 +      wilc->chip_ps_state = CHIP_SLEEPING_MANUAL;
        release_bus(wilc, RELEASE_ONLY);
  }
+ EXPORT_SYMBOL_GPL(wilc_chip_sleep_manually);
  
  void host_wakeup_notify(struct wilc *wilc)
  {