Merge remote-tracking branch 'md/for-next'

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/md/raid1.c
Simple merge

diff --cc drivers/md/raid10.c
Simple merge

diff --cc drivers/md/raid5.c
index 45933c1606972c007fee4393b82c05db7b24f7ec,e5befa356dbefa49341052cd34ec6f872ab658d4..704ef7fcfbf83239ff7ac119d37354576dea5221
--- 1/drivers/md/raid5.c
--- 2/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@@ -3497,9 -3504,11 +3504,12 @@@ returnbi
                        WARN_ON(test_bit(R5_SkipCopy, &dev->flags));
                        WARN_ON(dev->page != dev->orig_page);
                }
+ 
+       r5l_stripe_write_finished(sh);
+ 
        if (!discard_pending &&
            test_bit(R5_Discard, &sh->dev[sh->pd_idx].flags)) {
 +              int hash;
                clear_bit(R5_Discard, &sh->dev[sh->pd_idx].flags);
                clear_bit(R5_UPTODATE, &sh->dev[sh->pd_idx].flags);
                if (sh->qd_idx >= 0) {