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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
mm/bounce.c between commit 5d1f127c3e0c ("block: Convert
bio_for_each_segment() to bvec_iter") from the block tree and commit
df5494a36263 ("kthread: make kthread_create() killable") from the
akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc mm/bounce.c
index d5873f21567d,c9f0a4339a7d..000000000000
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@@ -198,14 -201,11 +198,12 @@@ static void __blk_queue_bounce(struct r
  {
  	struct bio *bio;
  	int rw = bio_data_dir(*bio_orig);
 -	struct bio_vec *to, *from;
 +	struct bio_vec *to, from;
 +	struct bvec_iter iter;
  	unsigned i;
  
- 	if (force)
- 		goto bounce;
 -	bio_for_each_segment(from, *bio_orig, i)
 -		if (page_to_pfn(from->bv_page) > queue_bounce_pfn(q))
 +	bio_for_each_segment(from, *bio_orig, iter)
 +		if (page_to_pfn(from.bv_page) > queue_bounce_pfn(q))
  			goto bounce;
  
  	return;

Attachment: pgp00000.pgp
Description: PGP signature