Merge tag 'md/4.2-fixes' of git://neil.brown.name/md