LU-4356 kernel: kernel update [SLES11 SP2 3.0.101-0.7]

[fs/lustre-release.git] / lustre / kernel_patches / kernel_configs / kernel-3.0-3.0-sles11-x86_64.config

diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config
index 2467609..8acf135 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 3.0.80 Kernel Configuration
+# Linux/x86_64 3.0.101 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -66,7 +66,7 @@ CONFIG_IRQ_WORK=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-0.5-default"
+CONFIG_LOCALVERSION="-0.7.15-default"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -649,10 +649,7 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
+# CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m