zram: add accounting for incompressible pages

[blktests-ci]

Pull request for series with
subject: zram: add accounting for incompressible pages
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1081514

[blktests-ci]

Upstream branch: 1796ef2
series: https://patchwork.kernel.org/project/linux-block/list/?series=1081514
version: 1

[blktests-ci]

Upstream branch: f53ce51
series: https://patchwork.kernel.org/project/linux-block/list/?series=1081514
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=1081514
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: zram: add accounting for incompressible pages
Using index info to reconstruct a base tree...
M	drivers/block/zram/zram_drv.c
M	drivers/block/zram/zram_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/block/zram/zram_drv.h
Auto-merging drivers/block/zram/zram_drv.c
CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c
Patch failed at 0001 zram: add accounting for incompressible pages'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc drivers/block/zram/zram_drv.c
index aebc710f0d6a,f16d52c4ed79..000000000000
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@@ -2476,11 -2490,14 +2485,19 @@@ static int recompress_slot(struct zram 
  		 * Secondary algorithms failed to re-compress the page
  		 * in a way that would save memory.
  		 *
 -		 * Mark the object incompressible if the max-priority
 -		 * algorithm couldn't re-compress it.
 +		 * Mark the object incompressible if the max-priority (the
 +		 * last configured one) algorithm couldn't re-compress it.
  		 */
++<<<<<<< HEAD
 +		if (highest_priority_algorithm(zram, prio))
 +			set_slot_flag(zram, index, ZRAM_INCOMPRESSIBLE);
++=======
+ 		if (prio < zram->num_active_comps)
+ 			return 0;
+ 		set_slot_flag(zram, index, ZRAM_INCOMPRESSIBLE);
+ 		atomic64_inc(&zram->stats.incompressible_pages);
+ 		atomic64_inc(&zram->stats.incompressible_pages_since);
++>>>>>>> zram: add accounting for incompressible pages
  		return 0;
  	}