From: Linus Torvalds Date: Thu, 9 Sep 2010 15:57:02 +0000 (-0700) Subject: Merge branch 'fixes' of git://oss.oracle.com/git/tma/linux-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cad46744a308299e1c33a549e3e9c9a5bc468f05;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'fixes' of git://oss.oracle.com/git/tma/linux-2.6 * 'fixes' of git://oss.oracle.com/git/tma/linux-2.6: ocfs2: Fix orphan add in ocfs2_create_inode_in_orphan ocfs2: split out ocfs2_prepare_orphan_dir() into locking and prep functions ocfs2: allow return of new inode block location before allocation of the inode ocfs2: use ocfs2_alloc_dinode_update_counts() instead of open coding ocfs2: split out inode alloc code from ocfs2_mknod_locked Ocfs2: Fix a regression bug from mainline commit(6b933c8e6f1a2f3118082c455eef25f9b1ac7b45). ocfs2: Fix deadlock when allocating page ocfs2: properly set and use inode group alloc hint ocfs2: Use the right group in nfs sync check. ocfs2: Flush drive's caches on fdatasync ocfs2: make __ocfs2_page_mkwrite handle file end properly. ocfs2: Fix incorrect checksum validation error ocfs2: Fix metaecc error messages --- cad46744a308299e1c33a549e3e9c9a5bc468f05