1 files changed, 3 insertions, 0 deletions

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index c3bf17be0e19..c5bbedff5ae5 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -40,6 +40,9 @@ ToDo/Notes:
         - Add fs/ntfs/malloc.h::ntfs_malloc_nofs_nofail() which is analogous to
           ntfs_malloc_nofs() but it performs allocations with __GFP_NOFAIL and
           hence cannot fail.
+        - Use ntfs_malloc_nofs_nofail() in the two critical regions in
+          fs/ntfs/runlist.c::ntfs_runlists_merge().  This means we no longer
+          need to panic() if the allocation fails as it now cannot fail.
 
 2.1.23 - Implement extension of resident files and make writing safe as well as
          many bug fixes, cleanups, and enhancements...