commit | 3280fb313911a80b13de52d9fe37f39668f2138e | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Oct 12 16:10:29 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Oct 12 16:10:29 2008 -0700 |
tree | 6903a275ab00172a88cf51ab1d570e4a3e1a286b | |
parent | f1b2a5ace996de339292d4035f9f5b294aecd11e [diff] | |
parent | f319fb8bf6899e08bdb8d1e09a4e7a129dfa2312 [diff] |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: fix kconfig typo and extra whitespace ext4: fix build failure without procfs ext4: add an option to control error handling on file data jbd2: don't dirty original metadata buffer on abort ext4: add checks for errors from jbd2 jbd2: fix error handling for checkpoint io jbd2: abort when failed to log metadata buffers