| commit | af209e0aea2b1a6216c728decfaa231f587b8c2b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 09 08:18:08 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 09 08:18:08 2011 -0800 |
| tree | d50d386d7e84abfd6ae96eb30cf08d19f8946f93 | |
| parent | 53523d5263dce1a3e3662c612f7050a4569071ad [diff] | |
| parent | 5d8c71f9e5fbdd95650be00294d238e27a363b5c [diff] |
Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md: raid5 crash during degradation md/raid5: never wait for bad-block acks on failed device. md: ensure new badblocks are handled promptly. md: bad blocks shouldn't cause a Blocked status on a Faulty device. md: take a reference to mddev during sysfs access. md: refine interpretation of "hold_active == UNTIL_IOCTL". md/lock: ensure updates to page_attrs are properly locked.