summaryrefslogtreecommitdiffstats
path: root/include/net/scm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-20 18:38:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-20 18:38:48 -0700
commitdb93f8b42036bd60d95e8d28ee98b308d5846b9f (patch)
treee98018a262346250f9bf8ff68b80132a94fd18ab /include/net/scm.h
parent8c3a13c84b90f2551b646ff2956ac68bef69a810 (diff)
parentc0a9f451e4e7ecd2ad1a6c27ea5c31d0226bdddf (diff)
downloadlinux-db93f8b42036bd60d95e8d28ee98b308d5846b9f.tar.bz2
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin: "Three groups of fixes: 1. Make sure we don't execute the early microcode patching if family < 6, since it would touch MSRs which don't exist on those families, causing crashes. 2. The Xen partial emulation of HyperV can be dealt with more gracefully than just disabling the driver. 3. More EFI variable space magic. In particular, variables hidden from runtime code need to be taken into account too." * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, microcode: Verify the family before dispatching microcode patching x86, hyperv: Handle Xen emulation of Hyper-V more gracefully x86,efi: Implement efi_no_storage_paranoia parameter efi: Export efi_query_variable_store() for efivars.ko x86/Kconfig: Make EFI select UCS2_STRING efi: Distinguish between "remaining space" and actually used space efi: Pass boot services variable info to runtime code Move utf16 functions to kernel core and rename x86,efi: Check max_size only if it is non-zero. x86, efivars: firmware bug workarounds should be in platform code
Diffstat (limited to 'include/net/scm.h')
0 files changed, 0 insertions, 0 deletions