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

[Stephen Rothwell]

Hi all,

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

  fs/squashfs/decompressor_multi_percpu.c

between commit:

  fd56200a16c7 ("squashfs: Make use of local lock in multi_cpu decompressor")

from the tip tree and commit:

  5697b27554f3 ("squashfs-migrate-from-ll_rw_block-usage-to-bio-fix")

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 fs/squashfs/decompressor_multi_percpu.c
index e206ebfe003c,d93e12d9b712..000000000000
--- a/fs/squashfs/decompressor_multi_percpu.c
+++ b/fs/squashfs/decompressor_multi_percpu.c
@@@ -75,19 -72,18 +75,18 @@@ void squashfs_decompressor_destroy(stru
  	}
  }
  
- int squashfs_decompress(struct squashfs_sb_info *msblk, struct buffer_head **bh,
- 	int b, int offset, int length, struct squashfs_page_actor *output)
+ int squashfs_decompress(struct squashfs_sb_info *msblk, struct bio *bio,
+ 	int offset, int length, struct squashfs_page_actor *output)
  {
 -	struct squashfs_stream __percpu *percpu;
  	struct squashfs_stream *stream;
  	int res;
  
 -	percpu = (struct squashfs_stream __percpu *)msblk->stream;
 -	stream = get_cpu_ptr(percpu);
 +	local_lock(&msblk->stream->lock);
 +	stream = this_cpu_ptr(msblk->stream);
 +
- 	res = msblk->decompressor->decompress(msblk, stream->stream, bh, b,
- 			offset, length, output);
- 
+ 	res = msblk->decompressor->decompress(msblk, stream->stream, bio,
+ 					      offset, length, output);
 -	put_cpu_ptr(stream);
 +	local_unlock(&msblk->stream->lock);
  
  	if (res < 0)
  		ERROR("%s decompression failed, data probably corrupt\n",

Attachment: pgp0lZ58oxkuy.pgp
Description: OpenPGP digital signature