diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-07 23:26:34 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-07 23:26:34 +0300 |
| commit | e0f121c5cc2cf079d13ebe65b490ca88ba6abe12 (patch) | |
| tree | cfc6d01b6ab33f3450bcd75d5d639e319ddd2796 /arch | |
| parent | 9b7fa2880fe716a30d2359d40d12ec4bc69ec7b5 (diff) | |
| parent | 1ad6f58ea9364b0a5d8ae06249653ac9304a8578 (diff) | |
| download | linux-e0f121c5cc2cf079d13ebe65b490ca88ba6abe12.tar.xz | |
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/cleanups.
The deprecated scsi passthrough for virtio_blk is removed"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio_balloon: Fix memory leaks on errors in virtballoon_probe()
virtio-balloon: Fix memory leak when unloading while hinting is in progress
virtio_balloon: prevent pfn array overflow
virtio-blk: remove VIRTIO_BLK_F_SCSI support
virtio-pci: check name when counting MSI-X vectors
virtio-balloon: initialize all vq callbacks
virtio-mmio: convert to devm_platform_ioremap_resource
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/configs/guest.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/guest.config b/arch/powerpc/configs/guest.config index 8b8cd18ecd7c..209f58515d88 100644 --- a/arch/powerpc/configs/guest.config +++ b/arch/powerpc/configs/guest.config @@ -1,5 +1,4 @@ CONFIG_VIRTIO_BLK=y -CONFIG_VIRTIO_BLK_SCSI=y CONFIG_SCSI_VIRTIO=y CONFIG_VIRTIO_NET=y CONFIG_NET_FAILOVER=y |