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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 3 Jul 2017 14:03:50 +1000

Hi all,

On Mon, 3 Jul 2017 13:56:16 +1000 Stephen Rothwell <[email-masked]> 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