From: Karel Zak <kzak@redhat.com>
Date: Mon, 26 Jun 2017 11:42:25 +0000 (+0200)
Subject: Merge branch 'usage-part1' of https://github.com/rudimeier/util-linux
X-Git-Tag: v2.31-rc1~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c525260293279acf7ebf116d0b402e47f7a6a17c;p=thirdparty%2Futil-linux.git

Merge branch 'usage-part1' of https://github.com/rudimeier/util-linux

* 'usage-part1' of https://github.com/rudimeier/util-linux:
  misc: no more errtryh()
  mkfs.cramfs: add --help and --version
  more: add --help and --version
  whereis: add --help and --version
  login: add --help and --version
  fsck: add --help and --version
  setarch: use errtryhelp()
  dmesg: do not accept any non-option arguments
  blkid: use errtryhelp instead of errtryh
  misc: remove superfluous null pointer checks for optarg
  uuidd: remove unused define
---

c525260293279acf7ebf116d0b402e47f7a6a17c