LU-5363 kernel: kernel update [SLES11 SP3 3.0.101-0.35]

Update target and config files for new version.
Back out change from LU-4351 that skips sanity test 54c.

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: I66713caa53d078f62a345a0cb3e32f0d426a7e36
Reviewed-on: http://review.whamcloud.com/11140
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index aba32d2..f279cad 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -3,10 +3,10 @@
        * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
        * Server support for kernels:
         2.6.32-431.23.3.el6 (RHEL6)
-        3.0.101-0.29        (SLES11SP3)
+        3.0.101-0.35        (SLES11SP3)
        * Client support for unpatched kernels:
          2.6.32-431.23.3.el6 (RHEL6)
-         3.0.101-0.29        (SLES11SP3)
+         3.0.101-0.35        (SLES11SP3)
          3.6.10-2.fc17       (FC17)
        * Recommended e2fsprogs version: 1.42.9.wc1 or newer
        * NFS export disabled when stack size < 8192 (32-bit Lustre clients),

diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config
index d4339ca..afd2687 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config
@@ -66,7 +66,7 @@ CONFIG_IRQ_WORK=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-0.29-default"
+CONFIG_LOCALVERSION="-0.35-default"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -300,6 +300,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
+# CONFIG_MUTEX_SPIN_USE_MCS_QUEUE is not set
 CONFIG_FREEZER=y
 
 #
@@ -430,6 +431,7 @@ CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_VMA_CACHE is not set
 CONFIG_CLEANCACHE=y
 # CONFIG_FRONTSWAP is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -1988,7 +1990,7 @@ CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_MAX_SGE=256
 CONFIG_FUSION_MAX_FC_SGE=256
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -2918,11 +2920,10 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=8
 CONFIG_SERIAL_MAX3107=m
 # CONFIG_SERIAL_MRST_MAX3110 is not set
 # CONFIG_SERIAL_MFD_HSU is not set
-CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_TIMBERDALE=m
+# CONFIG_SERIAL_TIMBERDALE is not set
 CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
@@ -3130,7 +3131,6 @@ CONFIG_GPIO_CS5535=m
 # CONFIG_GPIO_LANGWELL is not set
 CONFIG_GPIO_PCH=m
 CONFIG_GPIO_ML_IOH=m
-# CONFIG_GPIO_TIMBERDALE is not set
 CONFIG_GPIO_RDC321X=m
 
 #
@@ -3413,7 +3413,7 @@ CONFIG_MFD_MC13XXX=m
 # CONFIG_ABX500_CORE is not set
 CONFIG_EZX_PCAP=y
 CONFIG_MFD_CS5535=m
-CONFIG_MFD_TIMBERDALE=m
+# CONFIG_MFD_TIMBERDALE is not set
 CONFIG_LPC_SCH=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_JANZ_CMODIO=m
@@ -3544,7 +3544,6 @@ CONFIG_VIDEO_SAA6588=m
 #
 # Video decoders
 #
-CONFIG_VIDEO_ADV7180=m
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_BT866=m
@@ -3612,7 +3611,7 @@ CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
+# CONFIG_VIDEO_TIMBERDALE is not set
 CONFIG_VIDEO_CX88=m
 CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_VIDEO_CX88_BLACKBIRD=m
@@ -3724,12 +3723,11 @@ CONFIG_RADIO_SI4713=m
 CONFIG_USB_DSBR=m
 CONFIG_RADIO_SI470X=y
 CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
+# CONFIG_I2C_SI470X is not set
 CONFIG_USB_MR800=m
 CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
 CONFIG_RADIO_WL1273=m
 
 #
@@ -4853,7 +4851,7 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
-CONFIG_TIMB_DMA=m
+# CONFIG_TIMB_DMA is not set
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ENGINE=y
 
@@ -5900,6 +5898,8 @@ CONFIG_BINARY_PRINTF=y
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m

diff --git a/lustre/kernel_patches/targets/3.0-sles11sp3.target.in b/lustre/kernel_patches/targets/3.0-sles11sp3.target.in
index 9452477..43fb869 100644 (file)
--- a/lustre/kernel_patches/targets/3.0-sles11sp3.target.in
+++ b/lustre/kernel_patches/targets/3.0-sles11sp3.target.in
@@ -1,6 +1,6 @@
 lnxmaj="3.0"
 lnxmin=".101"
-lnxrel="0.29"
+lnxrel="0.35"
 # use this when there is an "RPM fix" which means that the name of the
 # (source) RPM has been updated but the version of the kernel inside the
 # RPM is not also updated

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 28ad836..57c0fa5 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -16,23 +16,6 @@ ALWAYS_EXCEPT="                42a  42b  42c  42d  45   51d   68b   $SANITY_EXCE
 # bug number for skipped tests: LU-2036
 ALWAYS_EXCEPT="                 76     $ALWAYS_EXCEPT"
 
-is_sles11()                                            # LU-4351
-{
-       if [ -r /etc/SuSE-release ]
-       then
-               local vers=`grep VERSION /etc/SuSE-release | awk '{print $3}'`
-               if [ $vers -eq 11 ]
-               then
-                       return 0
-               fi
-       fi
-       return 1
-}
-
-if is_sles11; then                                     # LU-4351
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 54c"
-fi
-
 SRCDIR=$(cd $(dirname $0); echo $PWD)
 export PATH=$PATH:/sbin