From: Linus Torvalds Date: Mon, 28 Jun 2010 05:56:32 +0000 (-0700) Subject: Merge branch 'for-linus' of git://neil.brown.name/md X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=93416253073511716f7e70c06e32c3810c3deac4;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md/raid5: don't include 'spare' drives when reshaping to fewer devices. md/raid5: add a missing 'continue' in a loop. md/raid5: Allow recovered part of partially recovered devices to be in-sync md/raid5: More careful check for "has array failed". md: Don't update ->recovery_offset when reshaping an array to fewer devices. md/raid5: avoid oops when number of devices is reduced then increased. md: enable raid4->raid0 takeover md: clear layout after ->raid0 takeover md: fix raid10 takeover: use new_layout for setup_conf md: fix handling of array level takeover that re-arranges devices. md: raid10: Fix null pointer dereference in fix_read_error() Restore partition detection of newly created md arrays. --- 93416253073511716f7e70c06e32c3810c3deac4