Merge branch 'work.thaw' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Apr 2018 19:28:32 +0000 (12:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Apr 2018 19:28:32 +0000 (12:28 -0700)
Pull vfs thaw updates from Al Viro:
 "An ancient series that has fallen through the cracks in the previous
  cycle"

* 'work.thaw' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  buffer.c: call thaw_super during emergency thaw
  vfs: factor sb iteration out of do_emergency_remount

1  2 
fs/buffer.c
fs/super.c
include/linux/fs.h

diff --cc fs/buffer.c
Simple merge
diff --cc fs/super.c
Simple merge
Simple merge