From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Theodore Ts'o <tytso@mit•edu>, "Jason A. Donenfeld" <Jason@zx2c4•com>
Cc: Yury Norov <yury.norov@gmail•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 bitmap tree with the random tree
Date: Wed, 12 Oct 2022 08:46:11 +1100 [thread overview]
Message-ID: <20221012084611.53852c92@canb.auug.org.au> (raw)
In-Reply-To: <20221007161411.731900ea@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
Hi all,
On Fri, 7 Oct 2022 16:14:11 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the bitmap tree got a conflict in:
>
> include/linux/nodemask.h
>
> between commit:
>
> 82f33a32b4d2 ("treewide: use prandom_u32_max() when possible")
>
> from the random tree and commit:
>
> 97848c10f9f8 ("lib/bitmap: remove bitmap_ord_to_pos")
>
> from the bitmap tree.
>
> 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 66ee9b4b7925,0c45fb066caa..000000000000
> --- a/include/linux/nodemask.h
> +++ b/include/linux/nodemask.h
> @@@ -508,8 -508,7 +508,7 @@@ static inline int node_random(const nod
>
> w = nodes_weight(*maskp);
> if (w)
> - bit = bitmap_ord_to_pos(maskp->bits,
> - prandom_u32_max(w), MAX_NUMNODES);
> - bit = find_nth_bit(maskp->bits, MAX_NUMNODES, get_random_int() % w);
> ++ bit = find_nth_bit(maskp->bits, MAX_NUMNODES, prandom_u32_max(w));
> return bit;
> #else
> return 0;
This is now a conflict between the random tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-10-11 23:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-07 5:14 linux-next: manual merge of the bitmap tree with the random tree Stephen Rothwell
2022-10-11 21:46 ` Stephen Rothwell [this message]
2022-10-11 23:33 ` Jason A. Donenfeld
-- strict thread matches above, loose matches on Subject: below --
2022-08-02 23:59 broonie
2022-08-06 5:40 ` Michael Ellerman
2022-07-26 8:56 Stephen Rothwell
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=20221012084611.53852c92@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jason@zx2c4$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
--cc=yury.norov@gmail$(echo .)com \
/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