Merge branch 'fix-luks-probe' of https://github.com/silentcreek/util-linux

* 'fix-luks-probe' of https://github.com/silentcreek/util-linux:
  libblkid: Ignore secondary LUKS2 header in blkid_do_safeprobe()

diff --cc libblkid/src/blkidP.h
Simple merge

diff --cc libblkid/src/probe.c
Simple merge

diff --cc libblkid/src/superblocks/luks.c
Simple merge