diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-17 10:43:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-17 10:43:19 -0700 |
| commit | a08797e853e27fedb2468d4fd45459fd62902143 (patch) | |
| tree | d6b2aa197ded9d9c4e81ef115540f5c76f1feb25 /kernel/trace/trace_events.c | |
| parent | s390: Fix broken build (diff) | |
| parent | jbd2: Fix oops in jbd2_journal_file_inode() (diff) | |
| download | linux-dev-a08797e853e27fedb2468d4fd45459fd62902143.tar.xz linux-dev-a08797e853e27fedb2468d4fd45459fd62902143.zip | |
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull jbd2 bug fixes from Ted Ts'o:
"Two jbd2 bug fixes, one of which is a regression fix"
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
jbd2: Fix oops in jbd2_journal_file_inode()
jbd2: Fix use after free after error in jbd2_journal_dirty_metadata()
Diffstat (limited to 'kernel/trace/trace_events.c')
0 files changed, 0 insertions, 0 deletions