diff --git a/[refs] b/[refs]
index bdfeb8e80e9c..d30a6052cab7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cf99b91c669510b785b459c211772091a94efd5
+refs/heads/master: 94cf3179ccfc69d727dd884fd0831d82ada6bb06
diff --git a/trunk/net/sunrpc/svc.c b/trunk/net/sunrpc/svc.c
index 1a6c16ed7fa6..e9632bb66535 100644
--- a/trunk/net/sunrpc/svc.c
+++ b/trunk/net/sunrpc/svc.c
@@ -686,8 +686,8 @@ choose_victim(struct svc_serv *serv, struct svc_pool *pool, unsigned int *state)
  * Create or destroy enough new threads to make the number
  * of threads the given number.  If `pool' is non-NULL, applies
  * only to threads in that pool, otherwise round-robins between
- * all pools.  Must be called with a svc_get() reference and
- * the BKL or another lock to protect access to svc_serv fields.
+ * all pools.  Caller must ensure that mutual exclusion between this and
+ * server startup or shutdown.
  *
  * Destroying threads relies on the service threads filling in
  * rqstp->rq_task, which only the nfs ones do.  Assumes the serv