Merge 4.13-rc2 into staging-next

This resolves a merge issue and gets the vmbox drm driver into this
branch to be able to start taking fixes for it...

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

diff --cc drivers/staging/Kconfig
index fdf060c4c494c92806f1165a1043b118c7d3b49d,ef28a1cb64aecf5a0af0afd0d33b3313eaf26013..e97d72e3bc404f8c02a2126a677cd2948658b046
--- 1/drivers/staging/Kconfig
--- 2/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -110,6 -110,6 +110,8 @@@ source "drivers/staging/ccree/Kconfig
  
  source "drivers/staging/typec/Kconfig"
  
+ source "drivers/staging/vboxvideo/Kconfig"
+ 
 +source "drivers/staging/pi433/Kconfig"
 +
  endif # STAGING

diff --cc drivers/staging/Makefile
index 998f6441e3aa4763b9c4c67dde0e789beb4e4726,2918580bdb9e215bfa407d4c38b94a661069c6fa..993ed0c1556cabff635e8e08c8a1ee1b1723beb7
--- 1/drivers/staging/Makefile
--- 2/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -44,4 -44,4 +44,5 @@@ obj-$(CONFIG_KS7010)          += ks7010
  obj-$(CONFIG_GREYBUS)         += greybus/
  obj-$(CONFIG_BCM2835_VCHIQ)   += vc04_services/
  obj-$(CONFIG_CRYPTO_DEV_CCREE)        += ccree/
+ obj-$(CONFIG_DRM_VBOXVIDEO)   += vboxvideo/
 +obj-$(CONFIG_PI433)           += pi433/