From: Karel Zak <kzak@redhat.com>
Date: Fri, 16 Jun 2017 08:50:24 +0000 (+0200)
Subject: Merge branch 'some-fixes' of https://github.com/rudimeier/util-linux
X-Git-Tag: v2.31-rc1~293
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=998ae28704281303b9131c717ec30e39ca8d62f8;p=thirdparty%2Futil-linux.git

Merge branch 'some-fixes' of https://github.com/rudimeier/util-linux

* 'some-fixes' of https://github.com/rudimeier/util-linux:
  travis: minor cosmetics
  lib: style cosmetics plymouth-ctrl.c
  libmount: fix warning "set but not used"
  more: remove unused variable
  tests: split partx in root and non-root
  tests: fix and refactor partx
---

998ae28704281303b9131c717ec30e39ca8d62f8