• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · aea8b5d1
    Linus Torvalds authored
    Pull namespace bugfixes from Eric Biederman:
     "This tree includes a partial revert for "fs: Limit sys_mount to only
      request filesystem modules." When I added the new style module aliases
      to the filesystems I deleted the old ones.  A bad move.  It turns out
      that distributions like Arch linux use module aliases when
      constructing ramdisks.  Which meant ultimately that an ext3 filesystem
      mounted with ext4 would not result in the ext4 module being put into
      the ramdisk.
    
      The other change in this tree adds a handful of filesystem module
      alias I simply failed to add the first time.  Which inconvinienced a
      few folks using cifs.
    
      I don't want to inconvinience folks any longer than I have to so here
      are these trivial fixes."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
      fs: Readd the fs module aliases.
      fs: Limit sys_mount to only request filesystem modules. (Part 3)
    aea8b5d1
hostfs_kern.c 20.4 KB