From: Linus Torvalds Date: Sat, 31 Oct 2009 19:12:19 +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=bf699c9bac124f0a095d8ef06f2d6b219300a822;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: async_tx: fix asynchronous raid6 recovery for ddf layouts async_pq: rename scribble page async_pq: kill a stray dma_map() call and other cleanups md/raid6: kill a gcc-4.0.1 'uninitialized variable' warning raid6/async_tx: handle holes in block list in async_syndrome_val md/async: don't pass a memory pointer as a page pointer. md: Fix handling of raid5 array which is being reshaped to fewer devices. md: fix problems with RAID6 calculations for DDF. md/raid456: downlevel multicore operations to raid_run_ops md: drivers/md/unroll.pl replaced with awk analog md: remove clumsy usage of do_sync_mapping_range from bitmap code md: raid1/raid10: handle allocation errors during array setup. md/raid5: initialize conf->device_lock earlier md/raid1/raid10: add a cond_resched Revert "md: do not progress the resync process if the stripe was blocked" --- bf699c9bac124f0a095d8ef06f2d6b219300a822