From: Linus Torvalds Date: Wed, 4 Apr 2012 15:31:06 +0000 (-0700) Subject: Merge tag 'md-3.4-fixes' of git://neil.brown.name/md X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=36bbffc0d55fbb7ab2c2de2613e3bbb0a6749b9b;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'md-3.4-fixes' of git://neil.brown.name/md Pull assorted md fixes from Neil Brown: - some RAID levels didn't clear up properly if md_integrity_register failed - a 'check' of RAID5/RAID6 doesn't actually read any data since a recent patch - so fix that (and mark for -stable) - a couple of other minor bugs. * tag 'md-3.4-fixes' of git://neil.brown.name/md: md/raid1,raid10: don't compare excess byte during consistency check. md/raid5: Fix a bug about judging if the operation is syncing or replacing md/raid1:Remove unnecessary rcu_dereference(conf->mirrors[i].rdev). md: Avoid OOPS when reshaping raid1 to raid0 md/raid5: fix handling of bad blocks during recovery. md/raid1: If md_integrity_register() failed,run() must free the mem md/raid0: If md_integrity_register() fails, raid0_run() must free the mem. md/linear: If md_integrity_register() fails, linear_run() must free the mem. --- 36bbffc0d55fbb7ab2c2de2613e3bbb0a6749b9b