Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync up with Linus #43

Merged
merged 22 commits into from
Feb 26, 2015
Merged

Sync up with Linus #43

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a7e6645
HID: wacom: Add missing ABS_MISC event and feature declaration for 27QHD
Pinglinux Feb 5, 2015
e0b561e
livepatch: fix format string in kobject_init_and_add()
Feb 15, 2015
f2de746
HID: i2c-hid: The interrupt should be level sensitive
westeri Jan 26, 2015
afe9893
HID: saitek: add USB ID for older R.A.T. 7
dsalt Jan 29, 2015
f9d904a
HID: hid-sensor-hub: Correct documentation
spandruvada Jan 7, 2015
ed11977
HID: sensor-hub: correct dyn_callback_lock IRQ-safe change
spandruvada Jan 7, 2015
6c40065
HID: sony: Fix a WARNING shown when rmmod-ing the driver
ao2 Feb 16, 2015
b0bd96f
lguest: now depends on PCI
rustyrussell Feb 19, 2015
f476893
lguest: update help text.
rustyrussell Feb 19, 2015
c4ce0da
livepatch: RCU protect struct klp_func all the time when used in klp_…
pmladek Feb 18, 2015
8b402c9
HID: sony: initialize sony_dev_list_lock properly
Feb 23, 2015
b94993f
HID: sony: fix uninitialized per-controller spinlock
Feb 23, 2015
6d00f37
HID: i2c-hid: Limit reads to wMaxInputLength bytes for input events
Feb 20, 2015
ef567cf
HID: microsoft: Add ID for NE7K wireless keyboard
jsitnicki Feb 21, 2015
31795b4
x86/xen: Make sure X2APIC_ENABLE bit of MSR_IA32_APICBASE is not set
Feb 11, 2015
fdfd811
x86/xen: allow privcmd hypercalls to be preempted
Feb 19, 2015
facb573
xen-scsiback: mark pvscsi frontend request consumed only after last read
jgross1 Feb 17, 2015
5054daa
x86/xen: Initialize cr4 shadow for 64-bit PV(H) guests
Feb 23, 2015
c4bbb39
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Feb 24, 2015
9ec0de0
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Feb 24, 2015
84257ce
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Feb 24, 2015
b24e2bd
Merge tag 'stable/for-linus-4.0-rc1-tag' of git://git.kernel.org/pub/…
torvalds Feb 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lguest: update help text. 
We now add about 10k, not 6k, when lguest support is compiled in.

Signed-off-by: Rusty Russell <[email protected]>
  • Loading branch information
@rustyrussell
rustyrussell committed Feb 19, 2015
commit f476893459318cb2eff3ecd2a05d4ceacf82e73e
2 changes: 1 addition & 1 deletion arch/x86/lguest/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ config LGUEST_GUEST
help
Lguest is a tiny in-kernel hypervisor. Selecting this will
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
and net drivers which lguest needs.