1
0
mirror of https://github.com/rancher/os-kernel.git synced 2025-05-07 06:36:20 +00:00

Merge pull request from imikushin/bump-kernel-config

bump kernel-config
This commit is contained in:
Ivan Mikushin 2015-12-29 14:47:55 +05:00
commit 176ac45bf7

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.2.0 Kernel Configuration
# Linux/x86 4.2.6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -438,6 +438,7 @@ CONFIG_X86_MCE_AMD=y
CONFIG_X86_MCE_THRESHOLD=y
# CONFIG_X86_MCE_INJECT is not set
CONFIG_X86_THERMAL_VECTOR=y
# CONFIG_VM86 is not set
# CONFIG_X86_16BIT is not set
CONFIG_X86_VSYSCALL_EMULATION=y
# CONFIG_I8K is not set
@ -549,6 +550,7 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_CMDLINE_BOOL is not set
CONFIG_MODIFY_LDT_SYSCALL=y
CONFIG_HAVE_LIVEPATCH=y
CONFIG_LIVEPATCH=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@ -1967,6 +1969,7 @@ CONFIG_REALTEK_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
# CONFIG_MDIO_OCTEON is not set
# CONFIG_MDIO_BCM_UNIMAC is not set
# CONFIG_MICREL_KS8995MA is not set
# CONFIG_PPP is not set