Merge branch 'hyperv' into 'sid'

cloud-amd64: enable UIO, UIO_HV_GENERIC, VFIO.

See merge request kernel-team/linux!108

debian/changelog

@@ -5,6 +5,9 @@ linux (4.19.16-2) UNRELEASED; urgency=medium
     source is set to disabled in debian/config/defines.
   * linux-perf: explicitly disable the jvmti feature and shared library.
   * Document pkg.linux.nosource in debian/README.source.
+  * [amd64] enable UIO_HV_GENERIC for Azure's VMBus access.
+  * [cloud-amd64] enable UIO for Azure's VMBus access, and VFIO for guests
+    running on an hypervisor that exposes a vIOMMU.
 
   [ Ben Hutchings ]
   * debian/rules.d, debian/rules.real: Restore build of userland headers for

debian/config/amd64/config.cloud-amd64

@@ -1144,11 +1144,6 @@ CONFIG_HYPERV_STORAGE=m
 # CONFIG_SERIAL_8250_MID is not set
 # CONFIG_SERIAL_8250_MOXA is not set
 
-##
-## file: drivers/uio/Kconfig
-##
-# CONFIG_UIO is not set
-
 ##
 ## file: drivers/usb/Kconfig
 ##
@@ -1159,11 +1154,6 @@ CONFIG_HYPERV_STORAGE=m
 ##
 # CONFIG_UWB is not set
 
-##
-## file: drivers/vfio/Kconfig
-##
-# CONFIG_VFIO is not set
-
 ##
 ## file: drivers/video/backlight/Kconfig
 ##

debian/config/kernelarch-x86/config

@@ -1729,6 +1729,11 @@ CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_LPSS is not set
 CONFIG_SERIAL_8250_MID=y
 
+##
+## file: drivers/uio/Kconfig
+##
+CONFIG_UIO_HV_GENERIC=m
+
 ##
 ## file: drivers/usb/Kconfig
 ##