Re: linux-next: manual merge of the tip tree with the block tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the tip tree with the block tree
Date	2017-07-03 06:10 +0200
Message-ID	<tZ0Qq-4bl-5@gated-at.bofh.it> (permalink)
References	<tZ0GK-3R7-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi all,

On Mon, 3 Jul 2017 13:56:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>  +		if (cpu < nr_queues) {
> - 			map[cpu] = cpu_to_queue_index(nr_queues, cpu, online_mask);
> ++			map[cpu] = cpu_to_queue_index(nr_queues, cpu)
>  +		} else {
>  +			first_sibling = get_first_sibling(cpu);
>  +			if (first_sibling == cpu)
> - 				map[cpu] = cpu_to_queue_index(nr_queues, cpu, online_mask);
> ++				map[cpu] = cpu_to_queue_index(nr_queues, cpu)

Clearly, I dropped a couple of semicolons here ... I added them to the
merge resolution.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the tip tree with the block tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-03 06:00 +0200
  Re: linux-next: manual merge of the tip tree with the block tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-03 06:10 +0200

csiph-web