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