diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-22 22:03:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-22 22:03:03 -0700 |
commit | 4b382d0643603819e8b48da58efc254cabc22574 (patch) | |
tree | 71ae8bc989af8a0137c065e4741a76dc4e4d4cb8 /arch/sparc/include/asm/delay.h | |
parent | bdfbe804c2303cb4b178bb4b5c3e855892472033 (diff) | |
parent | b098636cf04c89db4036fedc778da0acc666ad1a (diff) |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: allow resync_start to be set while an array is active.
md/raid10: reformat some loops with less indenting.
md/raid10: remove unused variable.
md/raid10: make more use of 'slot' in raid10d.
md/raid10: some tidying up in fix_read_error
md/raid1: improve handling of pages allocated for write-behind.
md/raid1: try fix_sync_read_error before process_checks.
md/raid1: tidy up new functions: process_checks and fix_sync_read_error.
md/raid1: split out two sub-functions from sync_request_write
md: make error_handler functions more uniform and correct.
md/multipath: discard ->working_disks in favour of ->degraded
md/raid1: clean up read_balance.
md: simplify raid10 read_balance
md/bitmap: fix saving of events_cleared and other state.
md: reject a re-add request that cannot be honoured.
md: Fix race when creating a new md device.
Diffstat (limited to 'arch/sparc/include/asm/delay.h')
0 files changed, 0 insertions, 0 deletions