From: Linus Torvalds Date: Fri, 9 Dec 2011 16:18:08 +0000 (-0800) Subject: Merge branch 'for-linus' of git://neil.brown.name/md X-Git-Tag: firefly_0821_release~3680^2~3966 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=af209e0aea2b1a6216c728decfaa231f587b8c2b;p=firefly-linux-kernel-4.4.55.git 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. --- af209e0aea2b1a6216c728decfaa231f587b8c2b