diff --git a/[refs] b/[refs] index c023def9784c..50e37c5ee409 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fae8cc5ed0714953b1ad7cf86f030d2177278424 +refs/heads/master: 7a90484825680e7831856105f5fef654e6c02701 diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c index bd06ea21756c..58c44d6453a0 100644 --- a/trunk/drivers/md/raid10.c +++ b/trunk/drivers/md/raid10.c @@ -3260,7 +3260,6 @@ static int run(struct mddev *mddev) disk->rdev = rdev; } - disk->rdev = rdev; disk_stack_limits(mddev->gendisk, rdev->bdev, rdev->data_offset << 9); /* as we don't honour merge_bvec_fn, we must never risk