From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Jens Axboe <axboe@kernel•dk>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Max Gurtovoy <maxg@mellanox•com>, Christoph Hellwig <hch@lst•de>
Subject: Re: linux-next: manual merge of the tip tree with the block tree
Date: Mon, 3 Jul 2017 14:03:50 +1000 [thread overview]
Message-ID: <20170703140350.7a29fd4b@canb.auug.org.au> (raw)
In-Reply-To: <20170703135616.3e49cab1@canb.auug.org.au>
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
next prev parent reply other threads:[~2017-07-03 4:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-03 3:56 linux-next: manual merge of the tip tree with the block tree Stephen Rothwell
2017-07-03 4:03 ` Stephen Rothwell [this message]
[not found] <1Vn5Pr0rEN5VNr1V-oUtQYs_wVms3VZ7jsttDqMtVv3XxoMEIBc7Yf3FJhEanCMsvJe9z8HjzX7cEMedSJX68A==@protonmail.internalid>
2025-09-15 22:25 ` Mark Brown
2025-09-16 0:28 ` Boqun Feng
2025-09-17 7:46 ` Andreas Hindborg
-- strict thread matches above, loose matches on Subject: below --
2020-11-09 3:14 Stephen Rothwell
2020-11-09 13:45 ` Thomas Gleixner
2020-11-09 14:06 ` Jens Axboe
2019-02-13 2:41 Stephen Rothwell
2017-11-01 6:10 Stephen Rothwell
2017-11-01 14:25 ` Jens Axboe
2017-11-01 14:37 ` Kees Cook
2014-05-09 4:46 Stephen Rothwell
[not found] <20100622143121.186fe9c4.sfr@canb.auug.org.au>
2010-06-22 21:06 ` Paul E. McKenney
2010-06-21 6:16 Stephen Rothwell
2010-06-21 17:13 ` Paul E. McKenney
2010-06-21 23:40 ` Stephen Rothwell
2010-06-22 0:04 ` Stephen Rothwell
2010-06-22 0:40 ` Paul E. McKenney
2010-06-22 6:26 ` Jens Axboe
2010-06-22 17:14 ` Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170703140350.7a29fd4b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=hch@lst$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxg@mellanox$(echo .)com \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox