From: yangsheng Date: Tue, 31 Jan 2012 01:25:07 +0000 (+0800) Subject: LU-1054 kernel: Kernel update [RHEL6.2 2.6.32-220.4.1.el6] X-Git-Tag: 2.1.56~3 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=d01072f88090b05d188aa82b8f0a8e8f60fe0dd1 LU-1054 kernel: Kernel update [RHEL6.2 2.6.32-220.4.1.el6] Update RHEL6.2 kernel to 2.6.32-220.4.1.el6. Signed-off-by: yang sheng Change-Id: Ife086ef0a8c521373434b02ff4e49dab85b9627c Reviewed-on: http://review.whamcloud.com/2058 Tested-by: Hudson Reviewed-by: Bobi Jam Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/ldiskfs/kernel_patches/patches/ext4-big-endian-check-2.6-rhel6.patch b/ldiskfs/kernel_patches/patches/ext4-big-endian-check-2.6-rhel6.patch index 91e55a8..2c43a87 100644 --- a/ldiskfs/kernel_patches/patches/ext4-big-endian-check-2.6-rhel6.patch +++ b/ldiskfs/kernel_patches/patches/ext4-big-endian-check-2.6-rhel6.patch @@ -11,7 +11,7 @@ Index: linux-stage/fs/ext4/super.c ext4_fsblk_t ext4_block_bitmap(struct super_block *sb, struct ext4_group_desc *bg) { -@@ -1492,8 +1494,8 @@ +@@ -1492,7 +1494,7 @@ Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_block_validity, Opt_noblock_validity, Opt_inode_readahead_blks, Opt_journal_ioprio, @@ -20,7 +20,6 @@ Index: linux-stage/fs/ext4/super.c Opt_discard, Opt_nodiscard, Opt_init_inode_table, Opt_noinit_inode_table, }; - @@ -1559,6 +1561,7 @@ {Opt_auto_da_alloc, "auto_da_alloc=%u"}, {Opt_auto_da_alloc, "auto_da_alloc"}, diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 0e3eb71..5aec2cd 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2,9 +2,9 @@ TBD Whamcloud, Inc. * version 2.2.0 * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix * Server support for kernels: - 2.6.32-220.el6 (RHEL6) + 2.6.32-220.4.1.el6 (RHEL6) * Client support for unpatched kernels: - 2.6.32-220.el6 (RHEL6) + 2.6.32-220.4.1.el6 (RHEL6) 2.6.27.19-5 (SLES11) 2.6.18-238.19.1.el5 (RHEL5) 2.6.16.60-0.69.1 (SLES10) @@ -16,6 +16,10 @@ TBD Whamcloud, Inc. the re-exporting nodes to be mounted with "32bitapi" mount option Severity : enhancement +Jira : LU-1054 +Description: Update RHEL6.2 kernel to 2.6.32-220.4.1.el6 + +Severity : enhancement Jira : LU-751 Description: Update RHEL6.2 kernel to 2.6.32-220.el6 diff --git a/lustre/kernel_patches/targets/2.6-rhel6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.target.in index c8e9a1e..24f44dd 100644 --- a/lustre/kernel_patches/targets/2.6-rhel6.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel6.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.32" -lnxrel="220.el6" +lnxrel="220.4.1.el6" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel6.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 3ed7274..01409be 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -2,10 +2,10 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: 2.6-rhel5 RHEL5: 2.6.18-238.19.1.el5 -2.6-rhel6 RHEL6: 2.6.32-220.el6 +2.6-rhel6 RHEL6: 2.6.32-220.4.1.el6 CLIENT SUPPORT FOR UNPATCHED KERNELS: 2.6.18-238.19.1.el5 (RHEL5) - 2.6.32-220.el6 (RHEL6) + 2.6.32-220.4.1.el6 (RHEL6) 2.6.16.60-0.69.1 (SLES10) 2.6.27.19-5 (SLES11)