From: Linus Torvalds Date: Fri, 30 Jan 2009 16:54:29 +0000 (-0800) Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 X-Git-Tag: v5.15~35384 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c01a25e7cf6dcb0fa69c155706d5dd1e76e53796;p=mirror_ubuntu-kernels.git 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: Remove bogus BUG() check in ext4_bmap() ext4: Fix building with EXT4FS_DEBUG ext4: Initialize the new group descriptor when resizing the filesystem ext4: Fix ext4_free_blocks() w/o a journal when files have indirect blocks jbd2: On a __journal_expect() assertion failure printk "JBD2", not "EXT3-fs" ext3: Add sanity check to make_indexed_dir ext4: Add sanity check to make_indexed_dir ext4: only use i_size_high for regular files ext4: fix wrong use of do_div --- c01a25e7cf6dcb0fa69c155706d5dd1e76e53796