tree 46a48b0bc4c771771a9e179b127acfa251f92326
parent 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d
parent 02214dc5461c36da26a34014cab4e1bb484edba2
author Linus Torvalds <torvalds@linux-foundation.org> 1297280695 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1297280695 -0800

Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md:
  FIX: md: process hangs at wait_barrier after 0->10 takeover
  md_make_request: don't touch the bio after calling make_request
  md: Don't allow slot_store while resync/recovery is happening.
  md: don't clear curr_resync_completed at end of resync.
  md: Don't use remove_and_add_spares to remove failed devices from a read-only array
  Add raid1->raid0 takeover support
  md: Remove the AllReserved flag for component devices.
  md: don't abort checking spares as soon as one cannot be added.
  md: fix the test for finding spares in raid5_start_reshape.
  md: simplify some 'if' conditionals in raid5_start_reshape.
  md: revert change to raid_disks on failure.