linux-next: manual merge of the mm-stable tree with the random tree

linux-next: manual merge of the mm-stable tree with the random tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

Hi all,

Today's linux-next merge of the mm-stable tree got a conflict in:

  mm/migrate.c

between commit:

  82f33a32b4d2 ("treewide: use prandom_u32_max() when possible")

from the random tree and commit:

  6c542ab75714 ("mm/demotion: build demotion targets based on explicit memory tiers")

from the mm-stable tree.

I fixed it up (the call to get_random_int() was replaced by node_random()
by the latter commit) 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the mm-stable tree with the random tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1539 bytes --]

Hi all,

Today's linux-next merge of the mm-stable 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:

  3e061d924fe9 ("lib/nodemask: optimize node_random for nodemask with single NUMA node")

from the mm-stable 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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/nodemask.h
index 6f8a09e41cec,e66742db741c..000000000000
--- 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, prandom_u32_max(w));
+ 		break;
+ 	}
  	return bit;
  #else
  	return 0;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]