From: Karel Zak <kzak@redhat.com>
Date: Tue, 10 Dec 2019 13:46:13 +0000 (+0100)
Subject: Merge branch 'dmverity_options' of https://github.com/bluca/util-linux
X-Git-Tag: v2.35-rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10dcb8d133e53d186ba73eccd2b386380aee289b;p=thirdparty%2Futil-linux.git

Merge branch 'dmverity_options' of https://github.com/bluca/util-linux

* 'dmverity_options' of https://github.com/bluca/util-linux:
  verity: add support for Forward Error Correction options
  verity: ensure that hash_device and root_hash[_file] are passed together or not at all
  verity: add new verity.roothashfile option
---

10dcb8d133e53d186ba73eccd2b386380aee289b