From 5d233680ac796867a9bb906ef6c788c9c6d46ef3 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Fri, 5 Mar 2010 13:42:23 -0800
Subject: [PATCH] --- yaml --- r: 186221 b: refs/heads/master c:
 478352e789f507105193d3d0177c3b4f26da0399 h: refs/heads/master i:   186219:
 18bbb59bc0fa61caa2f558dd236c038eadd02cc8 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/gfp.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1d235190a603..6653db8378de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 645747462435d84c6c6a64269ed49cc3015f753d
+refs/heads/master: 478352e789f507105193d3d0177c3b4f26da0399
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 2e1b32c0484d..4c6d41333f98 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -30,7 +30,8 @@ struct vm_area_struct;
  * _might_ fail.  This depends upon the particular VM implementation.
  *
  * __GFP_NOFAIL: The VM implementation _must_ retry infinitely: the caller
- * cannot handle allocation failures.
+ * cannot handle allocation failures.  This modifier is deprecated and no new
+ * users should be added.
  *
  * __GFP_NORETRY: The VM implementation must not retry indefinitely.
  *