sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'v4.12-rc5' into for-4.13/block

Browse Source 
We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.

Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe
2017-06-12 08:30:13 -06:00
parent 22ec656bcc 32c1431eea
commit 8f66439eec
742 changed files with 7025 additions and 3932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/ftrace.c
View File

@@ -5063,7 +5063,7 @@ ftrace_graph_release(struct inode *inode, struct file *file)
}
out:
kfree(fgd->new_hash);
free_ftrace_hash(fgd->new_hash);
kfree(fgd);
return ret;