linux-next: manual merge of the mm-stable tree with the bitmap tree
Subsystems (2)
[email protected]
maintainerHi 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.
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.
include/linux/nodemask.h +0 -0
@@@ -504,11 -505,21 +505,20 @@@ static inline int num_node_state(enum nstatic 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 ;
Yury Norov
maintainerQuoted 8 lines · On Tue, Sep 27, 2022 at 08:26:49PM +0100, [email protected] wrote:
Hi all,
Today's linux-next merge of the mm-stable tree got a conflict in:
include/linux/nodemask.hbetween commit:
Quoted 7 lines
97848c10f9f8a("lib/bitmap: removebitmap_ord_to_pos")from the bitmap tree and commit:
3e061d924fe9c("lib/nodemask: optimizenode_randomfor 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.
Quoted 37 lines
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.
include/linux/nodemask.h +11
-2@@@ -504,11 -505,21 +505,20 @@@ static inline int num_node_state(enum nstatic 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 ;
Mark Brown
maintainerQuoted 5 lines · Yury Norov
Quoted 3 lines · On Tue, Sep 27, 2022 at 08:26:49PM +0100, [email protected] wrote:
97848c10f9f8a("lib/bitmap: removebitmap_ord_to_pos")
Quoted 8 lines
Quoted 5 lines
from the bitmap tree and commit:
3e061d924fe9c("lib/nodemask: optimizenode_randomfor 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.
Normally it's Stephen, but he's off most of this week so I'm trying provide some cover.