diff options
author | 2020-04-08 10:51:53 -0700 | |
---|---|---|
committer | 2020-04-08 10:51:53 -0700 | |
commit | 9bb715260ed4cef6948cb2e05cf670462367da71 (patch) | |
tree | 520de5dd3eb6cd8372cc61759754d1cf2744a8c8 /drivers/misc | |
parent | mm/gup: Let __get_user_pages_locked() return -EINTR for fatal signal (diff) | |
parent | virtio-balloon: Revert "virtio-balloon: Switch back to OOM handler for VIRTIO... (diff) | |
download | linux-9bb715260ed4cef6948cb2e05cf670462367da71.tar.gz linux-9bb715260ed4cef6948cb2e05cf670462367da71.tar.bz2 linux-9bb715260ed4cef6948cb2e05cf670462367da71.zip |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin:
- Some bug fixes
- The new vdpa subsystem with two first drivers
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio-balloon: Revert "virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM"
vdpa: move to drivers/vdpa
virtio: Intel IFC VF driver for VDPA
vdpasim: vDPA device simulator
vhost: introduce vDPA-based backend
virtio: introduce a vDPA based transport
vDPA: introduce vDPA bus
vringh: IOTLB support
vhost: factor out IOTLB
vhost: allow per device message handler
vhost: refine vhost and vringh kconfig
virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
virtio-net: Introduce hash report feature
virtio-net: Introduce RSS receive steering feature
virtio-net: Introduce extended RSC feature
tools/virtio: option to build an out of tree module
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/mic/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig index b6841ba6d922..8f201d019f5a 100644 --- a/drivers/misc/mic/Kconfig +++ b/drivers/misc/mic/Kconfig @@ -133,8 +133,4 @@ config VOP OS and tools for MIC to use with this driver are available from <http://software.intel.com/en-us/mic-developer>. -if VOP -source "drivers/vhost/Kconfig.vringh" -endif - endmenu |