From: Karel Zak <kzak@redhat.com>
Date: Fri, 24 Mar 2017 10:59:57 +0000 (+0100)
Subject: Merge branch '2017wk11' of git://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.30-rc1~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3006dd73527eb43a960325d2f0e396f20f0828ba;p=thirdparty%2Futil-linux.git

Merge branch '2017wk11' of git://github.com/kerolasa/lelux-utiliteetit

* '2017wk11' of git://github.com/kerolasa/lelux-utiliteetit:
  blkid: add control struct
  blkid: simplify version option handling
  tests: add static keyword where needed [smatch scan]
  tests: do not use plain 0 as NULL [smatch scan]
  libsmartcols: fix test variable shadowing
---

3006dd73527eb43a960325d2f0e396f20f0828ba