Merge tag 'ntb-6.5' of https://github.com/jonmason/ntb