Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/lustre/lustre/llite/lloop.c between commit ed2d2f9a8265 ("block: Abstract out bvec iterator") from the block tree and commit de40d1209898 ("staging: lustre: fix bug with LL_MRF_RETURN in loop_make_request") from the staging tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc drivers/staging/lustre/lustre/llite/lloop.c index 3488bb6c44a7,e2421ea61352..000000000000 --- a/drivers/staging/lustre/lustre/llite/lloop.c +++ b/drivers/staging/lustre/lustre/llite/lloop.c @@@ -368,10 -365,9 +367,9 @@@ static void loop_make_request(struct re goto err; } loop_add_bio(lo, old_bio); - LL_MRF_RETURN(0); + return; err: - cfs_bio_io_error(old_bio, old_bio->bi_size); + cfs_bio_io_error(old_bio, old_bio->bi_iter.bi_size); - LL_MRF_RETURN(0); }
Attachment:
pgpq_BZYPJbcY.pgp
Description: PGP signature