linux-next: duplicate patches in the bitmap tree

linux-next: duplicate patches in the bitmap tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the net-next tree as different commits
(but the same patches):

  2386459394d2 ("lib/cpumask: update comment for cpumask_local_spread()")
  a99b18849bc8 ("net/mlx5e: Improve remote NUMA preferences used for the IRQ affinity hints")
  af547a927f9f ("sched/topology: Introduce for_each_numa_hop_mask()")
  439829e1bfba ("sched/topology: Introduce sched_numa_hop_mask()")
  c0d13fba970d ("lib/cpumask: reorganize cpumask_local_spread() logic")
  8ec0ffa233ab ("cpumask: improve on cpumask_local_spread() locality")
  6139966175ca ("sched: add sched_numa_find_nth_cpu()")
  ded3cee7db80 ("cpumask: introduce cpumask_nth_and_andnot")

These are commits

  2ac4980c57f5 ("lib/cpumask: update comment for cpumask_local_spread()")
  2acda57736de ("net/mlx5e: Improve remote NUMA preferences used for the IRQ affinity hints")
  06ac01721f7d ("sched/topology: Introduce for_each_numa_hop_mask()")
  9feae65845f7 ("sched/topology: Introduce sched_numa_hop_mask()")
  b1beed72b8b7 ("lib/cpumask: reorganize cpumask_local_spread() logic")
  406d394abfcd ("cpumask: improve on cpumask_local_spread() locality")
  cd7f55359c90 ("sched: add sched_numa_find_nth_cpu()")
  62f4386e564d ("cpumask: introduce cpumask_nth_and_andnot")

in the net-next tree.

There are some slight differences (I got a conflict merging the bitmap
tree today), but the net-next series is newer than the bitmap tree one ...

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the bitmap tree

[Yury Norov]

On Thu, Feb 09, 2023 at 01:02:24PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in the net-next tree as different commits
> (but the same patches):
> 
>   2386459394d2 ("lib/cpumask: update comment for cpumask_local_spread()")
>   a99b18849bc8 ("net/mlx5e: Improve remote NUMA preferences used for the IRQ affinity hints")
>   af547a927f9f ("sched/topology: Introduce for_each_numa_hop_mask()")
>   439829e1bfba ("sched/topology: Introduce sched_numa_hop_mask()")
>   c0d13fba970d ("lib/cpumask: reorganize cpumask_local_spread() logic")
>   8ec0ffa233ab ("cpumask: improve on cpumask_local_spread() locality")
>   6139966175ca ("sched: add sched_numa_find_nth_cpu()")
>   ded3cee7db80 ("cpumask: introduce cpumask_nth_and_andnot")
> 
> These are commits
> 
>   2ac4980c57f5 ("lib/cpumask: update comment for cpumask_local_spread()")
>   2acda57736de ("net/mlx5e: Improve remote NUMA preferences used for the IRQ affinity hints")
>   06ac01721f7d ("sched/topology: Introduce for_each_numa_hop_mask()")
>   9feae65845f7 ("sched/topology: Introduce sched_numa_hop_mask()")
>   b1beed72b8b7 ("lib/cpumask: reorganize cpumask_local_spread() logic")
>   406d394abfcd ("cpumask: improve on cpumask_local_spread() locality")
>   cd7f55359c90 ("sched: add sched_numa_find_nth_cpu()")
>   62f4386e564d ("cpumask: introduce cpumask_nth_and_andnot")
> 
> in the net-next tree.
> 
> There are some slight differences (I got a conflict merging the bitmap
> tree today), but the net-next series is newer than the bitmap tree one ...

I removed those from bitmap-for-next. Let's move with net-next.

linux-next: duplicate patches in the bitmap tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  d702b0ed6329 ("MAINTAINERS: bitmap: add UAPI headers")
  adb5c828d022 ("uapi: bitops: use UAPI-safe variant of BITS_PER_LONG again (2)")

These are commits

  1afc85deecd3 ("MAINTAINERS: bitmap: add UAPI headers")
  70b9c0c11e55 ("uapi: bitops: use UAPI-safe variant of BITS_PER_LONG again (2)")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the bitmap tree

[Yury Norov]

On Wed, Jul 09, 2025 at 09:08:42AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
>   d702b0ed6329 ("MAINTAINERS: bitmap: add UAPI headers")
>   adb5c828d022 ("uapi: bitops: use UAPI-safe variant of BITS_PER_LONG again (2)")
> 
> These are commits
> 
>   1afc85deecd3 ("MAINTAINERS: bitmap: add UAPI headers")
>   70b9c0c11e55 ("uapi: bitops: use UAPI-safe variant of BITS_PER_LONG again (2)")
> 
> in Linus' tree.

Fixed. Thanks.

linux-next: duplicate patches in the bitmap tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

(all the commits in the bitmap tree)

The tree seems to have been rebased for no good reason.  Please clean
it up.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the bitmap tree

[Yury Norov]

On Fri, Aug 01, 2025 at 11:27:27AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in Linus Torvalds' tree as different
> commits (but the same patches):
> 
> (all the commits in the bitmap tree)
> 
> The tree seems to have been rebased for no good reason.  Please clean
> it up.

Hi Stephen,

I didn't rebase it intentionally. Anyway, now the tree is rebased on
top of master. Hopefully it will clean the error.

Thanks,
YUry