From 179d6382519165878bd5628c99e42428f57ae107 Mon Sep 17 00:00:00 2001 From: Johann Lombardi Date: Mon, 31 May 2010 18:51:44 +0200 Subject: [PATCH] b=18399 remove prune_icache patch i=Andrew i=HongChao This patch is no longer needed, now that we pin the first page in memory thanks to the patch from bug 20008. --- lustre/ChangeLog | 5 +++++ lustre/kernel_patches/series/2.6-rhel5.series | 1 - lustre/kernel_patches/series/2.6-sles10.series | 1 - lustre/kernel_patches/series/2.6-sles11.series | 1 - 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 9564977..167bdb1 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -53,6 +53,11 @@ Bugzilla : 21244 Description: allow userland programs to include from stardard include directories +Severity : enhancement +Bugzilla : 18399 +Description: The prune-icache-use-trylock is no longer needed now that + the patch from bug 20008 is landed. + Severity : normal Bugzilla : 22244/21128 Description: stack overflow when freeing locks under memory pressure diff --git a/lustre/kernel_patches/series/2.6-rhel5.series b/lustre/kernel_patches/series/2.6-rhel5.series index 5999d69..34f334b 100644 --- a/lustre/kernel_patches/series/2.6-rhel5.series +++ b/lustre/kernel_patches/series/2.6-rhel5.series @@ -21,7 +21,6 @@ md-soft-lockups.patch jbd-journal-chksum-2.6.18-vanilla.patch quota-large-limits-rhel5.patch md-mmp-unplug-dev.patch -prune-icache-use-trylock-rhel5.patch jbd-slab-race-2.6-rhel5.patch mpt-fusion-max-sge.patch jbd2-jcberr-2.6-rhel5.patch diff --git a/lustre/kernel_patches/series/2.6-sles10.series b/lustre/kernel_patches/series/2.6-sles10.series index d39895a..83560d5 100644 --- a/lustre/kernel_patches/series/2.6-sles10.series +++ b/lustre/kernel_patches/series/2.6-sles10.series @@ -12,4 +12,3 @@ jbd-stats-2.6-sles10.patch quota-fix-oops-in-invalidate_dquots.patch quota-large-limits-sles10.patch md-mmp-unplug-dev-sles10.patch -prune-icache-use-trylock-sles10.patch diff --git a/lustre/kernel_patches/series/2.6-sles11.series b/lustre/kernel_patches/series/2.6-sles11.series index 3765521..61e48cd 100644 --- a/lustre/kernel_patches/series/2.6-sles11.series +++ b/lustre/kernel_patches/series/2.6-sles11.series @@ -12,4 +12,3 @@ md-mmp-unplug-dev-sles11.patch quota-support-64-bit-quota-format.patch jbd2-jcberr-2.6-sles11.patch jbd2-commit-timer-no-jiffies-rounding.diff -prune-icache-use-trylock-rhel5.patch -- 1.8.3.1