From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jul 2015 16:36:30 +0000 (-0700)
Subject: Merge tag 'for-f2fs-v4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu... 
X-Git-Tag: firefly_0821_release~176^2~1357
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2ee6b00070242bb03be185fbae3bb7ac203aded2;p=firefly-linux-kernel-4.4.55.git

Merge tag 'for-f2fs-v4.2-rc5' of git://git./linux/kernel/git/jaegeuk/f2fs

Pull f2fs fixes from Jaegeuk Kim.

* tag 'for-f2fs-v4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
  f2fs: call set_page_dirty to attach i_wb for cgroup
  f2fs: handle error cases in move_encrypted_block
---

2ee6b00070242bb03be185fbae3bb7ac203aded2