From: Karel Zak <kzak@redhat.com>
Date: Wed, 30 Jun 2021 10:07:50 +0000 (+0200)
Subject: Merge branch 'kill' of https://github.com/rossburton/util-linux
X-Git-Tag: v2.38-rc1~383
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c092ff340a059c8a3ca3a7e39a8ca974e4692e2;p=thirdparty%2Futil-linux.git

Merge branch 'kill' of https://github.com/rossburton/util-linux

* 'kill' of https://github.com/rossburton/util-linux:
  tests: check correct log file for errors in blkdiscard test
  tests: don't hardcode /bin/kill in the kill tests
---

9c092ff340a059c8a3ca3a7e39a8ca974e4692e2