Commit 6333ff6e authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-linus 

Pull MD fix from Song.

* 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid0: fix warning message for parameter default_layout
parents 09d6ac8d 3874d73e

drivers/md/raid0.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf) 
	} else {

		pr_err("md/raid0:%s: cannot assemble multi-zone RAID0 with default_layout setting\n",

		       mdname(mddev));

		pr_err("md/raid0: please set raid.default_layout to 1 or 2\n");

		pr_err("md/raid0: please set raid0.default_layout to 1 or 2\n");

		err = -ENOTSUPP;

		goto abort;

	}