Merge tag 'for-linus' of git://github.com/rustyrussell/linux