mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in r8169, bug fix had two versions in net and net-next, take the net-next hunks. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
68aaf44595
279 changed files with 2599 additions and 1287 deletions
|
|
@ -363,7 +363,9 @@ static int do_show(int argc, char **argv)
|
|||
if (fd < 0)
|
||||
return -1;
|
||||
|
||||
return show_prog(fd);
|
||||
err = show_prog(fd);
|
||||
close(fd);
|
||||
return err;
|
||||
}
|
||||
|
||||
if (argc)
|
||||
|
|
|
|||
Loading…
Reference in a new issue