From: Karel Zak <kzak@redhat.com>
Date: Tue, 5 Jan 2021 14:20:50 +0000 (+0100)
Subject: Merge branch '2020wk47' of https://github.com/kerolasa/util-linux
X-Git-Tag: v2.37-rc1~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b447adf50c61125c57922cc01ec3e6792cc48af;p=thirdparty%2Futil-linux.git

Merge branch '2020wk47' of https://github.com/kerolasa/util-linux

* '2020wk47' of https://github.com/kerolasa/util-linux:
  build-sys: sort various lists in configure.ac
  mkswap: tell how to fix insecure permissions and owner in warning
  lsipc: make default output byte sizes to be in human units
  man: add missing backslash to caret printing macro
  lscpu: fix variable shadowing
  uuidgen: give hint in usage() what uuid namepaces can be used
  uuidgen: use errx() rather than fprintf() when priting errors
  libuuid: simplify uuid_is_null() check
  uuidparse: use uuid type definitions from libuuid header
  uuidparse: use libuuid function to test nil uuid
---

4b447adf50c61125c57922cc01ec3e6792cc48af