From: Linus Torvalds Date: Fri, 3 Aug 2012 20:24:07 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d42d1dabf34bdd5ad832cb56a7338817aad8a052;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd Pull exofs update from Boaz Harrosh: "They are all mostly fixes, except the most important patch by Artem Bityutskiy which removes the use of s_dirt. After this patch s_dirt can be completely removed from the tree." * 'for-linus' of git://git.open-osd.org/linux-open-osd: ore: Fix out-of-bounds access in _ios_obj() exofs: Use proper max_IO calculations from ore exofs: Fix __r4w_get_page when offset is beyond i_size exofs: stop using s_dirt exofs: readpage_strip: Add a BUG_ON to check for PageLocked(page) --- d42d1dabf34bdd5ad832cb56a7338817aad8a052