Merge linux-block/for-4.3/core into md/for-linux
authorNeilBrown <neilb@suse.com>
Sat, 5 Sep 2015 09:07:04 +0000 (11:07 +0200)
committerNeilBrown <neilb@suse.com>
Sat, 5 Sep 2015 09:08:32 +0000 (11:08 +0200)
commite89c6fdf9e0eb1b5a03574d4ca73e83eae8deb91
treef9df292ed03a5a3c4ddc658ae3646f02a1ffafce
parentc3cce6cda162eb2b2960a85d9c8992f4f3be85d0
parent1081230b748de8f03f37f80c53dfa89feda9b8de
Merge linux-block/for-4.3/core into md/for-linux

There were a few conflicts that are fairly easy to resolve.

Signed-off-by: NeilBrown <neilb@suse.com>
drivers/md/md.c
drivers/md/raid0.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c