diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 25ba50e7db0056b0ce0dfd90f517a08ba94d8b70..f59cb9cd3d3af5c312096f46f020388ada62052e 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -5,18 +5,17 @@ tbd Sun Microsystems, Inc.
 	 2.6.9-67.0.7.EL (RHEL 4),
 	 2.6.16.54-0.2.5 (SLES 10),
 	 2.6.18-53.1.14.el5 (RHEL 5),
-	 2.6.18.8 vanilla (kernel.org)
 	 2.6.22.14 vanilla (kernel.org)
 	* Client support for unpatched kernels:
-	 (see http://wiki.lustre.org/index.php?title=Patchless_Client)
-	 2.6.16 - 2.6.22 vanilla (kernel.org)
+	  (see http://wiki.lustre.org/index.php?title=Patchless_Client)
+	  2.6.16 - 2.6.22 vanilla (kernel.org)
 	* Client support for unpatched kernels:
-	 we do not recommend using patchless RHEL4 clients with kernels
-	 prior to 2.6.9-55EL (RHEL4U5).
+	  we do not recommend using patchless RHEL4 clients with kernels
+	  prior to 2.6.9-55EL (RHEL4U5).
 	* Recommended e2fsprogs version: 1.40.7-sun1
 	* Note that reiserfs quotas are disabled on SLES 10 in this kernel.
 	* RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
-	 removed cwd "./" (refer to Bugzilla 14399).
+	  removed cwd "./" (refer to Bugzilla 14399).
 	* A new quota file format has been introduced in 1.6.5.
 	  The format conversion from prior releases is handled transparently,
 	  but releases older than 1.4.12/1.6.5 will not understand this new
@@ -29,7 +28,7 @@ Severity   : normal
 Bugzilla   : 12888
 Description: mds_mfd_close() ASSERTION(rc == 0) 
 Details    : In mds_mfd_close(), we need protect inode's writecount change 
-             within its orphan write semaphore to prevent possible races.
+	     within its orphan write semaphore to prevent possible races.
 
 Severity   : minor
 Bugzilla   : 14645
@@ -42,19 +41,13 @@ Severity   : minor
 Bugzilla   : 14949
 Description: don't panic with use echo client
 Details    : echo client pass NULL as client nid pointer and this produce null
-             pointer dereference.
+	     pointer dereference.
 
 Severity   : normal
 Bugzilla   : 15278
 Description: fix build on ppc32
 Details    : compile code with -m64 flag produce wrong object file for ppc32.
 
-Severity   : normal
-Bugzilla   : 14803
-Description: Don't update lov_desc members until making sure they are valid
-Details    : When updating lov_desc members via proc fs, need fix their
-             validities before doing the real update.
-
 Severity   : normal
 Bugzilla   : 15212
 Description: Reinitialize optind to 0 so that interactive lfs works in all cases
@@ -69,24 +62,23 @@ Description: Reinitialize optind to 0 so that interactive lfs works in all cases
         2.6.9-67.0.7.EL (RHEL 4),
         2.6.16.54-0.2.5 (SLES 10),
         2.6.18-53.1.14.el5 (RHEL 5),
-        2.6.18.8 vanilla (kernel.org)
         2.6.22.14 vanilla (kernel.org)
        * Client support for unpatched kernels:
-        (see http://wiki.lustre.org/index.php?title=Patchless_Client)
-        2.6.16 - 2.6.22 vanilla (kernel.org)
+         (see http://wiki.lustre.org/index.php?title=Patchless_Client)
+         2.6.16 - 2.6.22 vanilla (kernel.org)
        * Due to problems with nested symlinks and FMODE_EXEC (bug 12652),
-        we do not recommend using patchless RHEL4 clients with kernels
-        prior to 2.6.9-55EL (RHEL4U5).
+         we do not recommend using patchless RHEL4 clients with kernels
+         prior to 2.6.9-55EL (RHEL4U5).
        * Recommended e2fsprogs version: 1.40.7-sun1
        * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
        * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
-        removed cwd "./" (refer to Bugzilla 14399).
+         removed cwd "./" (refer to Bugzilla 14399).
        * A new quota file format has been introduced in 1.6.5.
          The format conversion from prior releases is handled transparently,
 	 but releases older than 1.4.12/1.6.5 will not understand this new
 	 format.  The automatic format conversion can be avoided by running
-	 the following command on the MDS:
-	 	'tunefs.lustre --param="mdt.quota_type=ug1" $MDTDEV'.
+	 the following command on the MDS before upgrading:
+		'tunefs.lustre --param="mdt.quota_type=ug1" $MDTDEV'.
 	 For more information, please refer to bugzilla 13904.
 
 Severity   : normal
@@ -139,9 +131,10 @@ Details    : adding a new constant LC_MIN_INIT and use it for initialization
 	     of lc_min.
 
 Severity   : normal
-Bugzilla   : 15406
-Description: misc fixes (including bug 15169 and 15175) for directory readahead.
-Details	   : prevent previous statahead async RPC callback from processing the
+Frequency  : with multiple concurrent readdir processes in same directory
+Bugzilla   : 15406, 15169, 15175
+Description: misc fixes for directory readahead.
+Details    : prevent previous statahead async RPC callback from processing the
 	     current "statahead_info", race condition between async RPC callback
 	     add dentry into dentry hash table and "ls" thread revalidate such
 	     dentry, statahead his/miss control for hidden items, and so on.
@@ -156,8 +149,8 @@ Description: incore types cleaning in quota code (with respect to 64-bit limits)
 Details    : several u32 variables declarations are replaced with u64 declarations
 
 Severity   : minor
-Bugzilla   : 13969
 Frequency  : always
+Bugzilla   : 13969
 Description: fix SLES kernel versioning
 Details    : the kernel version for our SLES 10 kernel did not include a "-"
 	     before the "smp" at the end.  while this was not a problem in
@@ -166,6 +159,14 @@ Details    : the kernel version for our SLES 10 kernel did not include a "-"
 	     this was most evident by the OFED build scripts.
 
 Severity   : normal
+Frequency  : rare
+Bugzilla   : 14803
+Description: Don't update lov_desc members until making sure they are valid
+Details    : When updating lov_desc members via proc fs, need fix their
+	     validities before doing the real update.
+
+Severity   : normal
+Frequency  : very rare
 Bugzilla   : 15069
 Description: don't put request into delay list while invalidate in flight.
 Details    : ptlrpc_delay_request sometimes put in delay list while invalidate
@@ -180,23 +181,24 @@ Severity   : enhancement
 Bugzilla   : 15240
 Description: Update kernel to RHEL4 2.6.9-67.0.7.
 
-Severity   : minor
+Severity   : normal
+Frequency  : always
 Bugzilla   : 14856
-Frequency  : on ppc only
+Frequency  : on PPC only
 Description: not convert ost objects for directory because it's not exist.
 Details    : ll_dir_getstripe assume dirrectory has ost objects but this wrong.
 
-Severity   : minor
+Severity   : enhancement
 Bugzilla   : 15517
 Description: Fix warnings with compile liblustre at sles10/rhel5 which have
 	     __u64 as usingied long long type.
 
 Severity   : minor
-Bugzilla   : 15210
 Frequency  : rare, on shutdown
+Bugzilla   : 15210
 Description: race process ast vs remove callback
-Details    : removing callback before disconnect import open race with processing
-	     callback.
+Details    : removing callback before disconnect import open race with
+	     processing callback.
 
 Severity   : enhancement
 Bugzilla   : 15416
@@ -204,26 +206,28 @@ Description: Update kernel to SLES9 2.6.5-7.311.
 
 Severity   : normal
 Bugzilla   : 12652
-Description: Add FMODE_EXEC to SLES10 SP1 series.
+Description: Files open for execute are not marked busy on SLES10
+Details    : Add FMODE_EXEC to SLES10 SP1 server kernel series.
 
 Severity   : enhancement
 Bugzilla   : 13397
 Description: Add server support for vanilla-2.6.22.14.
 
 Severity   : normal
+Frequency  : occasional
 Bugzilla   : 13375
-Descriptoin: make lov_create() will not stuck in obd_statfs_rqset()
+Description: make lov_create() will not stuck in obd_statfs_rqset()
 Details    : If an OST is down the MDS will hang indefinitely in
 	     obd_statfs_rqset() waiting for the statfs data. While for
 	     MDS QOS usage of statfs, it should not stuck in waiting.
 
-Severity   : normal
+Severity   : enhancement
 Bugzilla   : 3055
 Description: Disable adaptive timeouts by default
 
 Severity   : major
-Bugzilla   : 15027
 Frequency  : on network error
+Bugzilla   : 15027
 Description: panic with double free request if network error 
 Details    : mdc_finish_enqueue is finish request if any network error occuring,
 	     but it's true only for synchronus enqueue, for async enqueue 
@@ -231,8 +235,8 @@ Details    : mdc_finish_enqueue is finish request if any network error occuring,
 	     himself.
 
 Severity   : normal
-Bugzilla   : 14533
 Frequency  : rare, on recovery
+Bugzilla   : 14533
 Description: read procfs can produce deadlock in some situation
 Details    : Holding lprocfs lock with send rpc can produce block for destroy
 	     obd objects and this also block reconnect with -EALREADY.
@@ -249,6 +253,7 @@ Description: mdc_set_open_replay_data LBUG
 Details    : Set replay data for requests that are eligible for replay.
 
 Severity   : normal
+Frequency  : common
 Bugzilla   : 14321
 Description: lustre_mgs: operation 101 on unconnected MGS
 Details    : When MGC is disconnected from MGS long enough, MGS will evict the
@@ -282,25 +287,28 @@ Bugzilla   : 14793
 Description: Update RHEL4 kernel to 2.6.9-67.0.4.
 
 Severity   : minor
-Frequency  : rare on shutdown ost
+Frequency  : rare on shutdown OST
 Bugzilla   : 13196
 Description: Don't allow skipping OSTs if index has been specified.
 Details    : Don't allow skipping OSTs if index has been specified, make locking
 	     in internal create lots better.
 
 Severity   : normal
+Frequency  : rare
 Bugzilla   : 14421
 Description: ASSERTION(!PageDirty(page)) failed
 Details    : Wrong check could lead to an assertion failure under specific 
 	     load patterns.
 
 Severity   : normal
+Frequency  : rare
 Bugzilla   : 12228
 Description: LBUG in ptlrpc_check_set() bad phase ebc0de00
 Details    : access to bitfield in structure is always rounded to long 
 	     and this produce problem with not atomic change any bit.
 
 Severity   : normal
+Frequency  : always
 Bugzilla   : 13647
 Description: Lustre make rpms failed.
 Details    : Remove ldiskfs spec file to avoids rpmbuild be confused when
@@ -311,7 +319,7 @@ Bugzilla   : 14498
 Description: Update to SLES9 SP4 kernel-2.6.5-7.308.
 
 Severity   : normal
-Frequency  : rare on shutdown ost
+Frequency  : rare on shutdown OST
 Bugzilla   : 14608
 Description: If llog cancel was not send before clean_exports phase, this can
 	     produce deadlock in llog code.
@@ -321,6 +329,7 @@ Details    : If llog thread has last reference to obd and call class_import_put
 	     called from llog_commit_thread.
 
 Severity   : normal
+Frequency  : only if OST index is skipped
 Bugzilla   : 14607
 Description: NULL lov_tgts causing MDS oops
 Details    : more safe checks for NULL lov_tgts for avoid oops.
@@ -334,6 +343,7 @@ Bugzilla   : 14368
 Description: Update to RHEL5 latest kernel-2.6.18-53.1.4.el5.
 
 Severity   : normal
+Frequency  : always
 Bugzilla   : 14136
 Description: make mgs_setparam() handle fsname containing dash
 Details    : fsname containing a dash does not work with lctl conf_param
@@ -343,8 +353,8 @@ Bugzilla   : 14288
 Description: Update to RHEL4 Update-6 kernel-2.6.9-67.EL.
 
 Severity   : normal
-Bugzilla   : 12702
 Frequency  : rare, in recovery and (or) destroy lovobjid file.
+Bugzilla   : 12702
 Description: rewrite lov objid code.
 Details    : Cleanup for lov objid code, remove scability problems and wrong
 	     locking. Fix sending last_id into ost.
@@ -359,8 +369,8 @@ Description: Update to RHEL5 Update-1 kernel 2.6.18-53.el5.
 Details    : Use d_move_locked instead of __d_move.
 
 Severity   : major
-Bugzilla   : 14260
 Frequency  : rare, at shutdown
+Bugzilla   : 14260
 Description: access already free / zero obd_namespace.
 Details    : if client_disconnect_export was called without force flag set,
 	     and exist connect request in flight, this can produce access to
@@ -368,13 +378,13 @@ Details    : if client_disconnect_export was called without force flag set,
 	     store ocd flags in obd_namespace.
 
 Severity   : minor
-Bugzilla   : 14418
 Frequency  : only at startup
+Bugzilla   : 14418
 Description: not alloc memory with spinlock held.
 Details    : allocation memory with GFP_KERNEL can produce sleep deadlock,
 	     if any spinlock held.
 
-Severity   : major
+Severity   : normal
 Frequency  : always
 Bugzilla   : 14270
 Description: lfs find does not continue on file error
@@ -432,10 +442,10 @@ Bugzilla   : 13497
 Description: LASSERT_{REQ,REP}SWAB macros are buggy
 Details    : If SWAB_PARANOIA is disabled, the LASSERT_REQSWAB and
 	     LASSERT_REPSWAB macros become no-ops, which is incorrect. Drop
-	     these macros and replace them with their difinitions instead.
+	     these macros and replace them with their definitions instead.
 
 Severity   : normal
-Frequency  : rarely
+Frequency  : rare
 Bugzilla   : 13888
 Description: interrupt oig_wait produce painc on resend.
 Details    : brw_redo_request can be used for resend requests from ptlrpcd and
@@ -486,14 +496,14 @@ Details    : When CRAY_XT3 is defined, the fsgid supplied by the client is
 	     whereas the supplied fsgid can be trusted if it is in the list of
 	     supplementary groups returned by the group upcall.
 
-Severity   : normal
+Severity   : enhancement
 Bugzilla   : 12749
 Description: Root Squash Functionality
 Details    : Implementation of NFS-like root squash capability. Specifically,
 	     don't allow someone with root access on a client node to be able
 	     to manipulate files owned by root on a server node.
 
-Severity   : normal
+Severity   : enhancement
 Bugzilla   : 10718
 Description: Slow trucate/writes to huge files at high offsets.
 Details    : Directly associate cached pages to lock that protect those pages,
@@ -501,6 +511,7 @@ Details    : Directly associate cached pages to lock that protect those pages,
 	     once lock callback is received.
 
 Severity   : normal
+Frequency  : common
 Bugzilla   : 14379
 Description: Too many locks accumulating on client during NFS usage
 Details    : mds_open improperly used accmode to find out access mode to a
@@ -524,6 +535,7 @@ Details    : Console messages can now be disabled via lnet.printk.
 
 Severity   : normal
 Bugzilla   : 14614
+Frequency  : always
 Description: User code with malformed file open parameter crashes client node
 Details    : Before packing join_file req, all the related reference should be
 	     checked carefully in case some malformed flags cause fake join_file
@@ -702,10 +714,19 @@ Severity   : normal
 Bugzilla   : 15198
 Description: LDLM soft lockups - improvement
 Details    : It is be possible to send the lock handle along with each read 
-             or write request because the client is already doing a lock match 
+	     or write request because the client is already doing a lock match 
 	     itself so there isn't any reason the OST should have to re-do that
 	     search.
 
+Severity   : normal
+Frequency  : rare
+Bugzilla   : 14036
+Description: lfs quota fails with deactivated OSTS
+Details    : With this patch, three improvements are included:
+	     1. detete the softlimit in mds and osts when use "lfs quota".
+	     2. display the inaccurate data in the output of "lfs quota".
+	     3. try to get quota info when "lfs quota" is executed.
+
 --------------------------------------------------------------------------------
 
 2007-12-07         Cluster File Systems, Inc. <info@clusterfs.com>
@@ -2251,16 +2272,6 @@ Bugzilla   : 10816
 Description: Improve multi-block allocation algorithm to avoid fragmentation
 Details    : The mballoc3 code (ldiskfs2 only) adds new mechanisms to improve
 	     allocation locality and avoid filesystem fragmentation.
-
-Severity   : normal
-Frequency  : rare
-Bugzilla   : 14036
-Description: lfs quota fails with deactivated OSTS
-Details    : With this patch, three improvements are included:
-	     1. detete the softlimit in mds and osts when use "lfs quota".
-	     2. display the inaccurate data in the output of "lfs quota".
-	     3. try to get quota info when "lfs quota" is executed.
-
 ------------------------------------------------------------------------------
 
 2007-04-01  Cluster File Systems, Inc. <info@clusterfs.com>