lkml.org 
[lkml]   [2022]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the bitmap tree with the random tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2022-10-12 01:32    [W:0.034 / U:4.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site