From: Karel Zak <kzak@redhat.com>
Date: Wed, 31 Jan 2018 10:08:06 +0000 (+0100)
Subject: Merge branch 'libblkid-atari' of https://github.com/yontalcar/util-linux
X-Git-Tag: v2.32-rc1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a84ecc0d8218401696e8a7255ae4fe1d9e829ce;p=thirdparty%2Futil-linux.git

Merge branch 'libblkid-atari' of https://github.com/yontalcar/util-linux

* 'libblkid-atari' of https://github.com/yontalcar/util-linux:
  libblkid: atari - reject devices with blocksize != 512
  libblkid: atari - don't add duplicate entries
  libblkid: atari - test if any partition fits disk size
  tests: added missing expected outputs for partx (atari)
  libblkid: atari - fix bad variable name
  tests: added test for libblkid atari pt
  libblkid: Support for Atari partitioning scheme
---

9a84ecc0d8218401696e8a7255ae4fe1d9e829ce