From cee5416bc243ef6bad1fdcb5ef7732189a11a871 Mon Sep 17 00:00:00 2001 From: Lucian Adrian Grijincu Date: Mon, 23 May 2011 11:57:33 -0700 Subject: [PATCH] --- yaml --- r: 249903 b: refs/heads/master c: 52307a9e1d8910e205f6be2c4dd35900f7b11282 h: refs/heads/master i: 249901: f6228fdfacaee102328a433e305db5e4515d7c32 249899: 4ad41c3ac54a0e89c39ff4d80c512c9445d81452 249895: 10d98363cc14dfa7f2c8d878929aa5da953a9a30 249887: 8430d50f1c9595a59e3dd014446afe552f740135 v: v3 --- [refs] | 2 +- trunk/Documentation/sysctl/fs.txt | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d58992af3744..3bbd48a83e89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56dab6c20808f0405fee66ddc3dd092fd115d911 +refs/heads/master: 52307a9e1d8910e205f6be2c4dd35900f7b11282 diff --git a/trunk/Documentation/sysctl/fs.txt b/trunk/Documentation/sysctl/fs.txt index 4af0614147ef..88fd7f5c8dcd 100644 --- a/trunk/Documentation/sysctl/fs.txt +++ b/trunk/Documentation/sysctl/fs.txt @@ -231,13 +231,6 @@ its creation). This directory contains configuration options for the epoll(7) interface. -max_user_instances ------------------- - -This is the maximum number of epoll file descriptors that a single user can -have open at a given time. The default value is 128, and should be enough -for normal users. - max_user_watches ----------------