lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.9-rc4 into driver-core-next

Browse Source 
This is to fix up a build problem with a wireless driver due to the
dynamic-debug patches in this branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2013-01-17 19:48:18 -08:00
parent 52f7a82b59 7d1f9aeff1
commit ed408f7c0f
355 changed files with 10014 additions and 2275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/debugfs/inode.c
View File

@@ -176,7 +176,7 @@ static int debugfs_parse_options(char *data, struct debugfs_mount_opts *opts)
opts->uid = uid;
break;
case Opt_gid:
if (match_octal(&args[0], &option))
if (match_int(&args[0], &option))
return -EINVAL;
gid = make_kgid(current_user_ns(), option);
if (!gid_valid(gid))