• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · d4a63a83
    Linus Torvalds authored
    Pull user namespaces work from Eric Biederman:
     "The work to convert the kernel to use kuid_t and kgid_t has been
      finished since 3.12 so it is time to remove the scaffolding that
      allowed the work to progress incrementally.
    
      The first patch on this branch just removes the scaffolding, ensuring
      we will always get compile errors if people accidentally try the
      userspace and the kernel uid and gid types.  The second patch an
      overlooked and unused chunk of mips code that that fails to build
      after the first patch.
    
      The code hasn't been in linux-next for long (as I was out of it and
      could not sheppared the cold properly) but the patch has been around
      for a long time just waiting for the day when I had finished the
      uid/gid conversions.  Putting the code in linux-next did find the
      compile failure on mips so I took the time to get that fix reviewed
      and included.  Beyond that I am not too worried about errors because
      all these two patches do is delete a modest amount of code"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
      MIPS: VPE: Remove vpe_getuid and vpe_getgid
      userns:  userns: Remove UIDGID_STRICT_TYPE_CHECKS
    d4a63a83
Kconfig 59.2 KB