linux-next: manual merge of the block tree

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

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
block/blk-timeout.c between commit
7838c15b8dd18e78a523513749e5b54bda07b0cb ("Block: use round_jiffies_up
()") from Linus' tree and commit 514054ea03191f529c6783bc0048e173e5194a27
("block: optimizations in blk_rq_timed_out_timer()") from the block tree.

Just a context change.  I fixed it up (see below) and assume it will be
fixed in your tree shortly.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc block/blk-timeout.c
index 69185ea,151790e..0000000
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@@ -126,16 -133,19 +126,19 @@@ void blk_rq_timed_out_timer(unsigned lo
  			if (blk_mark_rq_complete(rq))
  				continue;
  			blk_rq_timed_out(rq);
+ 		} else {
+ 			if (!next || time_after(next, rq->deadline))
+ 				next = rq->deadline;
  		}
- 		if (!next_set) {
- 			next = rq->deadline;
- 			next_set = 1;
- 		} else if (time_after(next, rq->deadline))
- 			next = rq->deadline;
  	}
  
- 	if (next_set && !list_empty(&q->timeout_list))
+ 	/*
+ 	 * next can never be 0 here with the list non-empty, since we always
+ 	 * bump ->deadline to 1 so we can detect if the timer was ever added or not.
+ 	 * See comment in blk_add_timer()
+ 	 */
+ 	if (next)
 -		mod_timer(&q->timeout, round_jiffies(next));
 +		mod_timer(&q->timeout, round_jiffies_up(next));
  
  	spin_unlock_irqrestore(q->queue_lock, flags);
  }