mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'linus' into x86/setup-lzma
Conflicts: init/do_mounts_rd.c
This commit is contained in:
commit
b17304245f
3749 changed files with 674243 additions and 86435 deletions
|
|
@ -317,6 +317,7 @@ static int __init do_name(void)
|
|||
if (wfd >= 0) {
|
||||
sys_fchown(wfd, uid, gid);
|
||||
sys_fchmod(wfd, mode);
|
||||
sys_ftruncate(wfd, body_len);
|
||||
vcollected = kstrdup(collected, GFP_KERNEL);
|
||||
state = CopyFile;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue