Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/ipv6/route.c

This deals with a merge conflict between the net-next addition of the
inetpeer network namespace ops, and Thomas Graf's bug fix in
2a0c451ade8e1783c5d453948289e4a978d417c9 which makes sure we don't
register /proc/net/ipv6_route before it is actually safe to do so.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 8 deletions

diff --git a/fs/fuse/control.c b/fs/fuse/control.c
index 42593c587d48..03ff5b1eba93 100644
--- a/fs/fuse/control.c
+++ b/fs/fuse/control.c
@@ -75,19 +75,13 @@ static ssize_t fuse_conn_limit_write(struct file *file, const char __user *buf,
                                      unsigned global_limit)
 {
         unsigned long t;
-        char tmp[32];
         unsigned limit = (1 << 16) - 1;
         int err;
 
-        if (*ppos || count >= sizeof(tmp) - 1)
-                return -EINVAL;
-
-        if (copy_from_user(tmp, buf, count))
+        if (*ppos)
                 return -EINVAL;
 
-        tmp[count] = '\0';
-
-        err = strict_strtoul(tmp, 0, &t);
+        err = kstrtoul_from_user(buf, count, 0, &t);
         if (err)
                 return err;