Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Conflicts:
	drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index c9c6a345e17b..23d1d54b12a4 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1685,9 +1685,9 @@ int bitmap_create(mddev_t *mddev)
 
         bitmap->mddev = mddev;
 
-        bm = sysfs_get_dirent(mddev->kobj.sd, "bitmap");
+        bm = sysfs_get_dirent(mddev->kobj.sd, NULL, "bitmap");
         if (bm) {
-                bitmap->sysfs_can_clear = sysfs_get_dirent(bm, "can_clear");
+                bitmap->sysfs_can_clear = sysfs_get_dirent(bm, NULL, "can_clear");
                 sysfs_put(bm);
         } else
                 bitmap->sysfs_can_clear = NULL;