From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 24 Jul 2017 02:53:30 +0000 (-0700)
Subject: Merge 4.13-rc2 into staging-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a29e24907208a7e05e9bd3f990d3fc5ea49667de;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

a29e24907208a7e05e9bd3f990d3fc5ea49667de
diff --cc drivers/staging/Kconfig
index fdf060c4c494,ef28a1cb64ae..e97d72e3bc40
--- a/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 998f6441e3aa,2918580bdb9e..993ed0c1556c
--- a/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/