From adef64affc20741d081f24d064870caa7f067efe Mon Sep 17 00:00:00 2001 From: yangsheng Date: Fri, 18 Sep 2009 16:53:20 +0000 Subject: [PATCH] Branch b1_8 b=19848 i=johann, bobijam Update kernel to SLES11 2.6.27.29-0.1.1. --- lustre/ChangeLog | 6 +++++- .../kernel-2.6.27-2.6-sles11-i686-default.config | 17 ++++++++++++----- .../kernel_configs/kernel-2.6.27-2.6-sles11-i686.config | 17 ++++++++++++----- .../kernel-2.6.27-2.6-sles11-x86_64-default.config | 17 ++++++++++++----- .../kernel-2.6.27-2.6-sles11-x86_64.config | 17 ++++++++++++----- lustre/kernel_patches/targets/2.6-sles11.target.in | 4 ++-- lustre/kernel_patches/which_patch | 2 +- 7 files changed, 56 insertions(+), 24 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 39cf389..0653198 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2,7 +2,7 @@ tbd Sun Microsystems, Inc. * version 1.8.2 * Support for kernels: 2.6.16.60-0.42.4 (SLES 10), - 2.6.27.23-0.1 (SLES11), + 2.6.27.29-0.1 (SLES11), 2.6.18-128.7.1.el5 (RHEL 5) * Client support for unpatched kernels: (see http://wiki.lustre.org/index.php?title=Patchless_Client) @@ -15,6 +15,10 @@ tbd Sun Microsystems, Inc. more information, please refer to bugzilla 17630. Severity : enhancement +Bugzilla : 19848 +Description: Update kernel to SLES11 2.6.27.29-0.1.1. + +Severity : enhancement Bugzilla : 20200 Description: Added sanity-quota test to for lfs(1) to work with numeric uid/gid. diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-i686-default.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-i686-default.config index 81bc07f..0c89ce2 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-i686-default.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-i686-default.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27.21 -# Wed May 13 22:15:21 2009 +# Linux kernel version: 2.6.27.29 +# Tue Sep 8 23:54:13 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -299,6 +299,7 @@ CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_HIGHPTE=y CONFIG_X86_RESERVE_LOW_64K=y # CONFIG_MATH_EMULATION is not set @@ -3415,6 +3416,8 @@ CONFIG_SND_HDA_CODEC_SIGMATEL=y CONFIG_SND_HDA_CODEC_VIA=y CONFIG_SND_HDA_CODEC_ATIHDMI=y CONFIG_SND_HDA_CODEC_NVHDMI=y +CONFIG_SND_HDA_CODEC_INTELHDMI=y +CONFIG_SND_HDA_ELD=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y @@ -3873,7 +3876,11 @@ CONFIG_RT2870=m CONFIG_RT3070=m CONFIG_BENET=m CONFIG_RTL8187SE=m -CONFIG_DRM_PSB=m +CONFIG_RTL8192E=m +CONFIG_HYPERV=m +CONFIG_HYPERV_STORAGE=m +CONFIG_HYPERV_BLOCK=m +CONFIG_HYPERV_NET=m # # Firmware Drivers @@ -3937,6 +3944,7 @@ CONFIG_OCFS2_FS_STATS=y # CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_FS is not set # CONFIG_OCFS2_COMPAT_JBD is not set +CONFIG_OCFS2_FS_POSIX_ACL=y CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y @@ -4150,7 +4158,7 @@ CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=m CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set +CONFIG_DLM_DEBUG=y # # Kernel hacking @@ -4258,7 +4266,6 @@ CONFIG_SECURITY_DEFAULT="apparmor" CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_FILE_CAPABILITIES=y -CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-i686.config index 81bc07f..0c89ce2 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-i686.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27.21 -# Wed May 13 22:15:21 2009 +# Linux kernel version: 2.6.27.29 +# Tue Sep 8 23:54:13 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -299,6 +299,7 @@ CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_HIGHPTE=y CONFIG_X86_RESERVE_LOW_64K=y # CONFIG_MATH_EMULATION is not set @@ -3415,6 +3416,8 @@ CONFIG_SND_HDA_CODEC_SIGMATEL=y CONFIG_SND_HDA_CODEC_VIA=y CONFIG_SND_HDA_CODEC_ATIHDMI=y CONFIG_SND_HDA_CODEC_NVHDMI=y +CONFIG_SND_HDA_CODEC_INTELHDMI=y +CONFIG_SND_HDA_ELD=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y @@ -3873,7 +3876,11 @@ CONFIG_RT2870=m CONFIG_RT3070=m CONFIG_BENET=m CONFIG_RTL8187SE=m -CONFIG_DRM_PSB=m +CONFIG_RTL8192E=m +CONFIG_HYPERV=m +CONFIG_HYPERV_STORAGE=m +CONFIG_HYPERV_BLOCK=m +CONFIG_HYPERV_NET=m # # Firmware Drivers @@ -3937,6 +3944,7 @@ CONFIG_OCFS2_FS_STATS=y # CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_FS is not set # CONFIG_OCFS2_COMPAT_JBD is not set +CONFIG_OCFS2_FS_POSIX_ACL=y CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y @@ -4150,7 +4158,7 @@ CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=m CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set +CONFIG_DLM_DEBUG=y # # Kernel hacking @@ -4258,7 +4266,6 @@ CONFIG_SECURITY_DEFAULT="apparmor" CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_FILE_CAPABILITIES=y -CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-x86_64-default.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-x86_64-default.config index 69bca9a..78a3868 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-x86_64-default.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-x86_64-default.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27.21 -# Wed May 13 22:02:04 2009 +# Linux kernel version: 2.6.27.29 +# Tue Sep 8 23:55:10 2009 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -300,6 +300,7 @@ CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_X86_RESERVE_LOW_64K=y CONFIG_MTRR=y # CONFIG_MTRR_SANITIZER is not set @@ -3169,6 +3170,8 @@ CONFIG_SND_HDA_CODEC_SIGMATEL=y CONFIG_SND_HDA_CODEC_VIA=y CONFIG_SND_HDA_CODEC_ATIHDMI=y CONFIG_SND_HDA_CODEC_NVHDMI=y +CONFIG_SND_HDA_CODEC_INTELHDMI=y +CONFIG_SND_HDA_ELD=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y @@ -3614,7 +3617,11 @@ CONFIG_RT2870=m CONFIG_RT3070=m CONFIG_BENET=m CONFIG_RTL8187SE=m -CONFIG_DRM_PSB=m +CONFIG_RTL8192E=m +CONFIG_HYPERV=m +CONFIG_HYPERV_STORAGE=m +CONFIG_HYPERV_BLOCK=m +CONFIG_HYPERV_NET=m # # Firmware Drivers @@ -3679,6 +3686,7 @@ CONFIG_OCFS2_FS_STATS=y # CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_FS is not set # CONFIG_OCFS2_COMPAT_JBD is not set +CONFIG_OCFS2_FS_POSIX_ACL=y CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y @@ -3892,7 +3900,7 @@ CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=m CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set +CONFIG_DLM_DEBUG=y # # Kernel hacking @@ -3998,7 +4006,6 @@ CONFIG_SECURITY_DEFAULT="apparmor" CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_FILE_CAPABILITIES=y -CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-x86_64.config index 69bca9a..78a3868 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.27-2.6-sles11-x86_64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27.21 -# Wed May 13 22:02:04 2009 +# Linux kernel version: 2.6.27.29 +# Tue Sep 8 23:55:10 2009 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -300,6 +300,7 @@ CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_X86_RESERVE_LOW_64K=y CONFIG_MTRR=y # CONFIG_MTRR_SANITIZER is not set @@ -3169,6 +3170,8 @@ CONFIG_SND_HDA_CODEC_SIGMATEL=y CONFIG_SND_HDA_CODEC_VIA=y CONFIG_SND_HDA_CODEC_ATIHDMI=y CONFIG_SND_HDA_CODEC_NVHDMI=y +CONFIG_SND_HDA_CODEC_INTELHDMI=y +CONFIG_SND_HDA_ELD=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y @@ -3614,7 +3617,11 @@ CONFIG_RT2870=m CONFIG_RT3070=m CONFIG_BENET=m CONFIG_RTL8187SE=m -CONFIG_DRM_PSB=m +CONFIG_RTL8192E=m +CONFIG_HYPERV=m +CONFIG_HYPERV_STORAGE=m +CONFIG_HYPERV_BLOCK=m +CONFIG_HYPERV_NET=m # # Firmware Drivers @@ -3679,6 +3686,7 @@ CONFIG_OCFS2_FS_STATS=y # CONFIG_OCFS2_DEBUG_MASKLOG is not set # CONFIG_OCFS2_DEBUG_FS is not set # CONFIG_OCFS2_COMPAT_JBD is not set +CONFIG_OCFS2_FS_POSIX_ACL=y CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y @@ -3892,7 +3900,7 @@ CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=m CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set +CONFIG_DLM_DEBUG=y # # Kernel hacking @@ -3998,7 +4006,6 @@ CONFIG_SECURITY_DEFAULT="apparmor" CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set CONFIG_SECURITY_FILE_CAPABILITIES=y -CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 diff --git a/lustre/kernel_patches/targets/2.6-sles11.target.in b/lustre/kernel_patches/targets/2.6-sles11.target.in index 9d065af..7c5e145 100644 --- a/lustre/kernel_patches/targets/2.6-sles11.target.in +++ b/lustre/kernel_patches/targets/2.6-sles11.target.in @@ -1,9 +1,9 @@ lnxmaj="2.6.27" -lnxmin=".23" +lnxmin=".29" # when we fix up this lnxmaj/lnxmin/lnxrel business... #lnxrel="0.37_f594963d" # and note that this means we get rid of the EXTRA_VERSION_DELIMITER crap!! -lnxrel="23-0.1" +lnxrel="29-0.1" # this is the delimeter that goes between $lnxmaj and $lnxrel # defaults to "-" diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 1e60c07..5cef8e8 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -5,7 +5,7 @@ SUPPORTED KERNELS: 2.6-rhel5 RHEL5: 2.6.18-128.7.1.el5 2.6.18-vanilla kernel.org: 2.6.18.8 2.6.22-vanilla kernel.org: 2.6.22.14 -2.6-sles11 SLES11: 2.6.27.23-0.1 +2.6-sles11 SLES11: 2.6.27.29-0.1 CLIENT SUPPORT FOR UNPATCHED KERNELS: kernel.org 2.6.16-2.6.22 -- 1.8.3.1