From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Nov 2019 18:57:52 +0000 (-0800)
Subject: Merge tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v5.5-rc1~135
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0dd09bc02c1bad55e92306ca83b38b3cf48b9f40;p=users%2Fwilly%2Flinux.git

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

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'
  ...
---

0dd09bc02c1bad55e92306ca83b38b3cf48b9f40
diff --cc drivers/staging/Kconfig
index 333308fe807e,0f19b086865a..eaf753b70ec5
--- a/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 e4943cd63e98,b7c31b9fe044..0a4396c9067b
--- a/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/