Merge tag 'keys-fixes-20180222-2' of https://git.kernel.org/pub/scm/linux/kernel...