Merge tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging / iio updates from Greg KH:
 "Here is the big staging and iio set of patches for the 5.5-rc1
  release.

  It's the usual huge collection of cleanup patches all over the
  drivers/staging/ area, along with a new staging driver, and a bunch of
  new IIO drivers as well.

  Full details are in the shortlog, but all of these have been in
  linux-next for a long time with no reported issues"

* tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (548 commits)
  staging: vchiq: Have vchiq_dump_* functions return an error code
  staging: vchiq: Refactor indentation in vchiq_dump_* functions
  staging: fwserial: Fix Kconfig indentation (seven spaces)
  staging: vchiq_dump: Replace min with min_t
  staging: vchiq: Fix block comment format in vchiq_dump()
  staging: octeon: indent with tabs instead of spaces
  staging: comedi: usbduxfast: usbduxfast_ai_cmdtest rounding error
  staging: most: core: remove sysfs attr remove_link
  staging: vc04: Fix Kconfig indentation
  staging: pi433: Fix Kconfig indentation
  staging: nvec: Fix Kconfig indentation
  staging: most: Fix Kconfig indentation
  staging: fwserial: Fix Kconfig indentation
  staging: fbtft: Fix Kconfig indentation
  fbtft: Drop OF dependency
  fbtft: Make use of device property API
  fbtft: Drop useless #ifdef CONFIG_OF and dead code
  fbtft: Describe function parameters in kernel-doc
  fbtft: Make sure string is NULL terminated
  staging: rtl8723bs: remove set but not used variable 'change', 'pos'
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/imu/adis.c
Simple merge

diff --cc drivers/staging/Kconfig
index 333308f,0f19b08..eaf753b
--- 1/drivers/staging/Kconfig
--- 2/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -125,6 -125,8 +125,8 @@@ source "drivers/staging/exfat/Kconfig
  
  source "drivers/staging/qlge/Kconfig"
  
 -source "drivers/staging/vboxsf/Kconfig"
 +source "drivers/staging/hp/Kconfig"
  
+ source "drivers/staging/wfx/Kconfig"
+ 
  endif # STAGING

diff --cc drivers/staging/Makefile
index e4943cd,b7c31b9..0a4396c
--- 1/drivers/staging/Makefile
--- 2/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -53,4 -53,5 +53,5 @@@ obj-$(CONFIG_UWB)             += uwb
  obj-$(CONFIG_USB_WUSB)                += wusbcore/
  obj-$(CONFIG_EXFAT_FS)                += exfat/
  obj-$(CONFIG_QLGE)            += qlge/
 -obj-$(CONFIG_VBOXSF_FS)               += vboxsf/
 +obj-$(CONFIG_NET_VENDOR_HP)   += hp/
+ obj-$(CONFIG_WFX)             += wfx/

diff --cc drivers/staging/most/sound/sound.c
Simple merge