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