From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 11 Nov 2019 05:23:37 +0000 (+0100)
Subject: Merge 5.4-rc7 into staging-next
X-Git-Tag: for-linus-20191205~82^2~76
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f0cb9b5dfd1a6014349354e63768500a860cad53;p=linux-block.git

Merge 5.4-rc7 into staging-next

We want the staging fixes in here, and it resolves some merge issues.

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

f0cb9b5dfd1a6014349354e63768500a860cad53
diff --cc drivers/staging/Kconfig
index a490141a0e88,927d29eb92c6..0f19b086865a
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -125,6 -125,6 +125,8 @@@ source "drivers/staging/exfat/Kconfig
  
  source "drivers/staging/qlge/Kconfig"
  
+ source "drivers/staging/vboxsf/Kconfig"
+ 
 +source "drivers/staging/wfx/Kconfig"
 +
  endif # STAGING
diff --cc drivers/staging/Makefile
index 4cb548a0ff87,f01f04199073..b7c31b9fe044
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -53,4 -53,4 +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_WFX)		+= wfx/