mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two cases of overlapping changes, nothing fancy. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
af144a9834
129 changed files with 1265 additions and 899 deletions
|
|
@ -171,7 +171,7 @@ static int do_show(int argc, char **argv)
|
|||
|
||||
cgroup_fd = open(argv[0], O_RDONLY);
|
||||
if (cgroup_fd < 0) {
|
||||
p_err("can't open cgroup %s", argv[1]);
|
||||
p_err("can't open cgroup %s", argv[0]);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
|
|
@ -359,7 +359,7 @@ static int do_attach(int argc, char **argv)
|
|||
|
||||
cgroup_fd = open(argv[0], O_RDONLY);
|
||||
if (cgroup_fd < 0) {
|
||||
p_err("can't open cgroup %s", argv[1]);
|
||||
p_err("can't open cgroup %s", argv[0]);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
|
|
@ -417,7 +417,7 @@ static int do_detach(int argc, char **argv)
|
|||
|
||||
cgroup_fd = open(argv[0], O_RDONLY);
|
||||
if (cgroup_fd < 0) {
|
||||
p_err("can't open cgroup %s", argv[1]);
|
||||
p_err("can't open cgroup %s", argv[0]);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue