linux-next: manual merge of the akpm-current tree with the block tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1607 bytes --]

Hi Andrew,

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

  drivers/block/zram/zram_drv.h

between commit:

  233bde21aa43 ("block: Move SECTOR_SIZE and SECTOR_SHIFT definitions into <linux/blkdev.h>")

from the block tree and commit:

  5d95e0f3a22b ("zram: drop max_zpage_size and use zs_huge_class_size()")

from the akpm-current 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.h
index 1e9bf65c0bfb,d71c8000a964..000000000000
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@@ -21,22 -21,7 +21,6 @@@
  
  #include "zcomp.h"
  
- /*-- Configurable parameters */
- 
- /*
-  * Pages that compress to size greater than this are stored
-  * uncompressed in memory.
-  */
- static const size_t max_zpage_size = PAGE_SIZE / 4 * 3;
- 
- /*
-  * NOTE: max_zpage_size must be less than or equal to:
-  *   ZS_MAX_ALLOC_SIZE. Otherwise, zs_malloc() would
-  * always return failure.
-  */
- 
- /*-- End of configurable params */
- 
 -#define SECTOR_SHIFT		9
  #define SECTORS_PER_PAGE_SHIFT	(PAGE_SHIFT - SECTOR_SHIFT)
  #define SECTORS_PER_PAGE	(1 << SECTORS_PER_PAGE_SHIFT)
  #define ZRAM_LOGICAL_BLOCK_SHIFT 12

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]