Merge tag 'f2fs-for-4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Oct 2017 18:04:00 +0000 (11:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Oct 2017 18:04:00 +0000 (11:04 -0700)
Pull f2fs fix from Jaegeuk Kim:
 "This contains one bug fix which causes a kernel panic during fstrim
  introduced in 4.14-rc1"

* tag 'f2fs-for-4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
  f2fs: fix potential panic during fstrim


Trivial merge