From: Karel Zak Date: Mon, 20 May 2019 10:35:38 +0000 (+0200) Subject: Merge branch '2019wk19' of https://github.com/kerolasa/util-linux X-Git-Tag: v2.34-rc2~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=002931c485dd66c23b63750a7d9d09637e9bc1ef;p=thirdparty%2Futil-linux.git Merge branch '2019wk19' of https://github.com/kerolasa/util-linux * '2019wk19' of https://github.com/kerolasa/util-linux: lib/colors: remove redundant if statement wipefs: fix variable / function shadowing [cppcheck] sulogin: fix variable / function shadowing [cppcheck] lscpu: remove redundant condition check [cppcheck] libmount: avoid possible null pointer dereference [cppcheck] lib/mangle: fix possible null pointer dereference [cppcheck] sfdisk: remove unnecessary size check [cppcheck] --- 002931c485dd66c23b63750a7d9d09637e9bc1ef