From: Linus Torvalds Date: Wed, 28 Nov 2007 02:54:17 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a531a141089714efe39eca89593524fdf05104f2;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'upstream-linus' of git://git./linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2: reverse inline-data truncate args ocfs2: Fix comparison in ocfs2_size_fits_inline_data() ocfs2: Remove bug statement in ocfs2_dentry_iput() [PATCH] ocfs2: Remove expensive bitmap scanning ocfs2: log valid inode # on bad inode ocfs2: Filter -ENOSPC in mlog_errno() [PATCH] fs/ocfs2: Add missing "space" ocfs2: Reset journal parameters after s_mount_opt update --- a531a141089714efe39eca89593524fdf05104f2