Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next