Merge branch 'for-4.19-nmi' into for-linus