diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 6cca06fda936a907aad2b0cab5a3291cb7f58ba8..328b84f6f30e3f988162ad9f5c68d2f25e8c4c45 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -11,6 +11,13 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * Recommended e2fsprogs version: 1.39.cfs8
        * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
 
+Severity   : normal
+Bugzilla   : 12606
+Description: don't use GFP_* in generic Lustre code.
+Details    : Use cfs_alloc_* functions and CFS_* flags for code portability.
+
+--------------------------------------------------------------------------------
+
 2007-08-10         Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.6.1
        * Support for kernels: