util-linux: fix conflicts in previous commit.