linux-next: manual merge of the staging tree with the block tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/zram/zram_drv.c between commit 5a7bbad27a41 ("block:
remove support for bio remapping from ->make_request") from the block
tree and commit 0900beae178a ("staging: zram: fix zram locking") from the
staging tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/zram/zram_drv.c
index 02589ca,b9926ee..0000000
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@@ -572,9 -573,18 +573,17 @@@ static void zram_make_request(struct re
  	}
  
  	__zram_make_request(zram, bio, bio_data_dir(bio));
+ 	up_read(&zram->init_lock);
+ 
 -	return 0;
++	return;
+ 
+ error_unlock:
+ 	up_read(&zram->init_lock);
+ error:
+ 	bio_io_error(bio);
 -	return 0;
  }
  
- void zram_reset_device(struct zram *zram)
+ void __zram_reset_device(struct zram *zram)
  {
  	size_t index;

Attachment: pgp00000.pgp
Description: PGP signature