Hi Linus, Please pull: git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git for_linus This fixes a typo in fs/Kconfig, a build problem when CONFIG_PROC_FS is not defined, and some patches that address error handling for disk write failures that had been forward ported from ext3 by Hidehiro-san that I hadn't time to audit before my last pull. Thanks!! - Ted Alexander Beregalov (1): ext4: fix build failure without procfs Hidehiro Kawai (5): jbd2: abort when failed to log metadata buffers jbd2: fix error handling for checkpoint io ext4: add checks for errors from jbd2 jbd2: don't dirty original metadata buffer on abort ext4: add an option to control error handling on file data Jan Engelhardt (1): ext4: fix kconfig typo and extra whitespace Documentation/filesystems/ext4.txt | 5 +++ fs/Kconfig | 4 +- fs/ext4/ext4.h | 2 + fs/ext4/ioctl.c | 12 ++++++--- fs/ext4/super.c | 41 +++++++++++++++++++++++++++--- fs/jbd2/checkpoint.c | 49 +++++++++++++++++++++++++++--------- fs/jbd2/commit.c | 10 ++++++- fs/jbd2/journal.c | 28 ++++++++++++++++---- fs/jbd2/recovery.c | 7 +++- include/linux/jbd2.h | 5 +++- 10 files changed, 131 insertions(+), 32 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html