Commit 84257ce6 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull lguest fixes from Rusty Russell:
 "Lguest weird config build fix, and update to the documentation"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  lguest: update help text.
  lguest: now depends on PCI
parents 9ec0de0e f4768934
config LGUEST_GUEST config LGUEST_GUEST
bool "Lguest guest support" bool "Lguest guest support"
depends on X86_32 && PARAVIRT depends on X86_32 && PARAVIRT && PCI
select TTY select TTY
select VIRTUALIZATION select VIRTUALIZATION
select VIRTIO select VIRTIO
...@@ -8,7 +8,7 @@ config LGUEST_GUEST ...@@ -8,7 +8,7 @@ config LGUEST_GUEST
help help
Lguest is a tiny in-kernel hypervisor. Selecting this will Lguest is a tiny in-kernel hypervisor. Selecting this will
allow your kernel to boot under lguest. This option will increase allow your kernel to boot under lguest. This option will increase
your kernel size by about 6k. If in doubt, say N. your kernel size by about 10k. If in doubt, say N.
If you say Y here, make sure you say Y (or M) to the virtio block If you say Y here, make sure you say Y (or M) to the virtio block
and net drivers which lguest needs. and net drivers which lguest needs.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment