From: Karel Zak <kzak@redhat.com>
Date: Fri, 17 Apr 2020 09:02:29 +0000 (+0200)
Subject: Merge branch 'map-user' of https://github.com/mat8913/util-linux
X-Git-Tag: v2.36-rc1~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75c7684724ea203f85bdb60fb0cf28a653ffe85a;p=thirdparty%2Futil-linux.git

Merge branch 'map-user' of https://github.com/mat8913/util-linux

* 'map-user' of https://github.com/mat8913/util-linux:
  unshare: Support names for map-user/group options
  lib/pwdutils: add xgetgrnam
  unshare: allow custom uid/gid mappings in userns
---

75c7684724ea203f85bdb60fb0cf28a653ffe85a