[linux] 04/16: vsock: Enable VSOCKETS, VHOST_VSOCK, VIRTIO_VSOCKETS as modules

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit f967694f22f60c2820c93e32a3b18bb86836d566
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Jan 11 02:32:11 2017 +0000

    vsock: Enable VSOCKETS, VHOST_VSOCK, VIRTIO_VSOCKETS as modules
---
 debian/changelog                    | 1 +
 debian/config/config                | 8 ++++++++
 debian/config/kernelarch-x86/config | 1 -
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 64f7585..1d72618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ linux (4.9.2-1~exp1) UNRELEASED; urgency=medium
   * udeb: Add switch (DSA) drivers to nic-modules (Closes: #845075)
   * netfilter: Enable NFT_NUMGEN, NFT_QUOTA as modules
   * net/sched: Enable NET_ACT_TUNNEL_KEY, NET_IFE_SKBTCINDEX as modules
+  * vsock: Enable VSOCKETS, VHOST_VSOCK, VIRTIO_VSOCKETS as modules
 
   [ John Paul Adrian Glaubitz ]
   * [sh3] Build a linux-libc-dev package (Closes: #850732)
diff --git a/debian/config/config b/debian/config/config
index c99cc36..138ca56 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4807,6 +4807,7 @@ CONFIG_UWB_I1480U=m
 ##
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
 ##
@@ -6689,6 +6690,13 @@ CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 
 ##
+## file: net/vmw_vsock/Kconfig
+##
+CONFIG_VSOCKETS=m
+# CONFIG_VMWARE_VMCI_VSOCKETS is not set
+CONFIG_VIRTIO_VSOCKETS=m
+
+##
 ## file: net/wimax/Kconfig
 ##
 CONFIG_WIMAX=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index bed0a6c..0ba63ff 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1972,7 +1972,6 @@ CONFIG_NFC_HCI=m
 ##
 ## file: net/vmw_vsock/Kconfig
 ##
-CONFIG_VSOCKETS=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 
 ##

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git