Merge tag 'ntb-3.18' of git://github.com/jonmason/ntb