Hi Neil,
Today's linux-next merge of the md tree got a conflict in
drivers/md/raid5.c between commit
0e6e0271a210817e202c8a4bfffbde3e3c0616d1 ("md/raid5: fix bug in reshape
code when chunk_size decreases") from the md-current tree and commit
dbf4da18b39fd412a76c3e1b9d7b29c8cc0197fb ("md: convert conf->chunk_size
and conf->prev_chunk to sectors") from the md tree.
Overlapping changes. I used the version from the md-current tree
(stripe_addr+reshape_sectors) as it appears to be newer.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpewSyvlEUm6.pgp
Description: PGP signature
