]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'ioctl_ns' of https://github.com/masatake/util-linux
authorKarel Zak <kzak@redhat.com>
Tue, 13 Apr 2021 08:34:49 +0000 (10:34 +0200)
committerKarel Zak <kzak@redhat.com>
Tue, 13 Apr 2021 08:34:49 +0000 (10:34 +0200)
* 'ioctl_ns' of https://github.com/masatake/util-linux:
  lsns: add columns for parent namespaces and owner namespaces


Trivial merge