linux-next: manual merge of the block tree with the mm-stable tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  drivers/block/zram/zram_drv.c

between commit:

  58652f2b6d21 ("zram: permit only one post-processing operation at a time")

from the mm-stable tree and commit:

  5fcfcd51ea1c ("zram: fix NULL pointer in comp_algorithm_show()")

from the block tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/block/zram/zram_drv.c
index cee49bb0126d,5223a03cb10e..000000000000
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@@ -2571,7 -2381,8 +2571,9 @@@ static int zram_add(void
  	zram->disk->fops = &zram_devops;
  	zram->disk->private_data = zram;
  	snprintf(zram->disk->disk_name, 16, "zram%d", device_id);
 +	atomic_set(&zram->pp_in_progress, 0);
+ 	zram_comp_params_reset(zram);
+ 	comp_algorithm_set(zram, ZRAM_PRIMARY_COMP, default_compressor);
  
  	/* Actual capacity set using sysfs (/sys/block/zram<id>/disksize */
  	set_capacity(zram->disk, 0);

Attachment: pgposKvO9B_S3.pgp
Description: OpenPGP digital signature