]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 166c5a6 b2dde6f)
Merge tag 'f2fs-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Apr 2016 20:00:39 +0000 (13:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Apr 2016 20:00:39 +0000 (13:00 -0700)
Pull f2fs fixes from Jaegeuk Kim.

* tag 'f2fs-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
  f2fs: retrieve IO write stat from the right place
  f2fs crypto: fix corrupted symlink in encrypted case
  f2fs: cover large section in sanity check of super

1  2 
fs/f2fs/namei.c patch | diff1 | diff2 | blob | history
fs/f2fs/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/f2fs/namei.c
Simple merge
diff --cc fs/f2fs/super.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.