Merge commit 'v2.6.32-rc7'

Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index e9cad8889cf9..1d529551e944 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -6500,8 +6500,9 @@ void md_do_sync(mddev_t *mddev)
  skip:
         mddev->curr_resync = 0;
         mddev->curr_resync_completed = 0;
-        mddev->resync_min = 0;
-        mddev->resync_max = MaxSector;
+        if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery))
+                /* We completed so max setting can be forgotten. */
+                mddev->resync_max = MaxSector;
         sysfs_notify(&mddev->kobj, NULL, "sync_completed");
         wake_up(&resync_wait);
         set_bit(MD_RECOVERY_DONE, &mddev->recovery);