From: Yury Norov <yury.norov@gmail•com>
To: broonie@kernel•org
Cc: Andrew Morton <akpm@linux-foundation•org>,
"Aneesh Kumar K . V" <aneesh.kumar@linux•ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the mm-stable tree with the bitmap tree
Date: Tue, 27 Sep 2022 12:38:09 -0700 [thread overview]
Message-ID: <YzNRIep0dLbT2HGr@yury-laptop> (raw)
In-Reply-To: <20220927192650.516143-1-broonie@kernel.org>
On Tue, Sep 27, 2022 at 08:26:49PM +0100, broonie@kernel•org wrote:
> Hi all,
>
> Today's linux-next merge of the mm-stable tree got a conflict in:
>
> include/linux/nodemask.h
>
> between commit:
>
> 97848c10f9f8a ("lib/bitmap: remove bitmap_ord_to_pos")
>
> from the bitmap tree and commit:
>
> 3e061d924fe9c ("lib/nodemask: optimize node_random for nodemask with single NUMA node")
>
> from the mm-stable tree.
The fix is correct. I sent the updated patch to Stephen, and
apparently had to CC you. Thanks.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc include/linux/nodemask.h
> index 0c45fb066caa7,e66742db741cf..0000000000000
> --- a/include/linux/nodemask.h
> +++ b/include/linux/nodemask.h
> @@@ -504,11 -505,21 +505,20 @@@ static inline int num_node_state(enum n
> static inline int node_random(const nodemask_t *maskp)
> {
> #if defined(CONFIG_NUMA) && (MAX_NUMNODES > 1)
> - int w, bit = NUMA_NO_NODE;
> + int w, bit;
>
> w = nodes_weight(*maskp);
> - if (w)
> + switch (w) {
> + case 0:
> + bit = NUMA_NO_NODE;
> + break;
> + case 1:
> + bit = first_node(*maskp);
> + break;
> + default:
> - bit = bitmap_ord_to_pos(maskp->bits,
> - get_random_int() % w, MAX_NUMNODES);
> + bit = find_nth_bit(maskp->bits, MAX_NUMNODES, get_random_int() % w);
> + break;
> + }
> return bit;
> #else
> return 0;
next prev parent reply other threads:[~2022-09-27 19:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 19:26 linux-next: manual merge of the mm-stable tree with the bitmap tree broonie
2022-09-27 19:38 ` Yury Norov [this message]
2022-09-27 19:55 ` Mark Brown
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=YzNRIep0dLbT2HGr@yury-laptop \
--to=yury.norov@gmail$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=aneesh.kumar@linux$(echo .)ibm.com \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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