]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://neil.brown.name/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jun 2009 15:41:22 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jun 2009 15:41:22 +0000 (08:41 -0700)
commit294a1bc3c15080ef6a2cf7ce34931bd26ebdb661
treee96ed48c0f9ad90e3d8dd319874dc6b577958374
parent92d319d913a2d4a576c4829d57fcdfcb87319e57
parent3148f933b5103c97363daefb98b262ee3681d48b
Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md:
  md/raid5: fix bug in reshape code when chunk_size decreases.
  md/raid5 - avoid deadlocks in get_active_stripe during reshape
  md/raid5: use conf->raid_disks in preference to mddev->raid_disk