git.ipfire.org Git - thirdparty/util-linux.git/commitdiff

author	Karel Zak <kzak@redhat.com>
	Mon, 20 May 2019 10:35:38 +0000 (12:35 +0200)
committer	Karel Zak <kzak@redhat.com>
	Mon, 20 May 2019 10:35:38 +0000 (12:35 +0200)

* '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]

		1	2
sys-utils/lscpu.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge