linux-next: manual merge of the kunit-next tree with the mm tree

linux-next: manual merge of the kunit-next tree with the mm tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the kunit-next tree got conflicts in:

  lib/math/Makefile
  lib/math/tests/Makefile

between commit:

  aa2cc84cfeb0 ("lib/math: add int_log test suite")

from the mm-nonmm-unstable branch of the mm tree and commit:

  f099bda563dd ("lib: math: Move kunit tests into tests/ subdir")

from the kunit-next tree.

I fixed it up (I used the latter version of lib/math/Makefile and see
below the signature by the patch immediately 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.

rom: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 4 Oct 2024 13:51:56 +1000
Subject: [PATCH] fix up for "lib: math: Move kunit tests into tests/ subdir"

interacting with "lib/math: add int_log test suite" from the mm tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 lib/Kconfig.debug       | 2 +-
 lib/math/tests/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 9ed36fec4390..d3e44b17876d 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -3105,7 +3105,7 @@ config INT_POW_KUNIT_TEST
 
 	  If unsure, say N
 
-config INT_LOG_TEST
+config INT_LOG_KUNIT_TEST
 	tristate "Integer log (int_log) test" if !KUNIT_ALL_TESTS
 	depends on KUNIT
 	default KUNIT_ALL_TESTS
diff --git a/lib/math/tests/Makefile b/lib/math/tests/Makefile
index 64b9bfe3381d..89a266241e98 100644
--- a/lib/math/tests/Makefile
+++ b/lib/math/tests/Makefile
@@ -2,6 +2,6 @@
 
 obj-$(CONFIG_DIV64_KUNIT_TEST)    += div64_kunit.o
 obj-$(CONFIG_INT_POW_KUNIT_TEST)  += int_pow_kunit.o
-obj-$(CONFIG_INT_LOG_TEST) += int_log_kunit.o
+obj-$(CONFIG_INT_LOG_KUNIT_TEST)  += int_log_kunit.o
 obj-$(CONFIG_MULDIV64_KUNIT_TEST) += mul_u64_u64_div_u64_kunit.o
 obj-$(CONFIG_RATIONAL_KUNIT_TEST) += rational_kunit.o
-- 

-- 
Cheers,
Stephen Rothwell

diff --cc lib/math/tests/Makefile
index 83bbf1e47940,f9a0a0e6b73a..000000000000
--- a/lib/math/tests/Makefile
+++ b/lib/math/tests/Makefile
@@@ -1,4 -1,6 +1,7 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  
- obj-$(CONFIG_INT_POW_TEST) += int_pow_kunit.o
+ obj-$(CONFIG_DIV64_KUNIT_TEST)    += div64_kunit.o
+ obj-$(CONFIG_INT_POW_KUNIT_TEST)  += int_pow_kunit.o
 +obj-$(CONFIG_INT_LOG_TEST) += int_log_kunit.o
+ obj-$(CONFIG_MULDIV64_KUNIT_TEST) += mul_u64_u64_div_u64_kunit.o
+ obj-$(CONFIG_RATIONAL_KUNIT_TEST) += rational_kunit.o

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

linux-next: manual merge of the kunit-next tree with the mm tree

[Stephen Rothwell]

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

Hi all,

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

  lib/Kconfig.debug

between commit:

  0f2016a962f0 ("lib/Kconfig.debug: move int_pow test option to runtime testing section")

from the mm-nonmm-unstable branch of the mm tree and commit:

  f099bda563dd ("lib: math: Move kunit tests into tests/ subdir")

from the kunit-next 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 lib/Kconfig.debug
index 409dd193c09b,0d6c979f0bfd..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -2993,22 -2993,6 +2993,22 @@@ config TEST_OBJPOO
  
  	  If unsure, say N.
  
- config INT_POW_TEST
++config INT_POW_KUNIT_TEST
 +	tristate "Integer exponentiation (int_pow) test" if !KUNIT_ALL_TESTS
 +	depends on KUNIT
 +	default KUNIT_ALL_TESTS
 +	help
 +	  This option enables the KUnit test suite for the int_pow function,
 +	  which performs integer exponentiation. The test suite is designed to
 +	  verify that the implementation of int_pow correctly computes the power
 +	  of a given base raised to a given exponent.
 +
 +	  Enabling this option will include tests that check various scenarios
 +	  and edge cases to ensure the accuracy and reliability of the exponentiation
 +	  function.
 +
 +	  If unsure, say N
 +
  endif # RUNTIME_TESTING_MENU
  
  config ARCH_USE_MEMTEST

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

Re: linux-next: manual merge of the kunit-next tree with the mm tree

[Shuah Khan]

On 10/3/24 21:55, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kunit-next tree got conflicts in:
> 
>    lib/math/Makefile
>    lib/math/tests/Makefile
> 
> between commit:
> 
>    aa2cc84cfeb0 ("lib/math: add int_log test suite")
> 
> from the mm-nonmm-unstable branch of the mm tree and commit:
> 
>    f099bda563dd ("lib: math: Move kunit tests into tests/ subdir")
> 
> from the kunit-next tree.
> 
> I fixed it up (I used the latter version of lib/math/Makefile and see
> below the signature by the patch immediately 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.

Sorry for the delay on this. Thank you for fixing this up.

Andrew,

Looks like we might see more conflicts between mm and kunit trees
with the move from lib/ lib/tests/

I dropped a couple of patches I couldn't apply. Would you like
me to drop this from kunit tree?

Adding David as well for feedback on this.

> 
> rom: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 4 Oct 2024 13:51:56 +1000
> Subject: [PATCH] fix up for "lib: math: Move kunit tests into tests/ subdir"
> 
> interacting with "lib/math: add int_log test suite" from the mm tree.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>   lib/Kconfig.debug       | 2 +-
>   lib/math/tests/Makefile | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
> index 9ed36fec4390..d3e44b17876d 100644
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -3105,7 +3105,7 @@ config INT_POW_KUNIT_TEST
>   
>   	  If unsure, say N
>   
> -config INT_LOG_TEST
> +config INT_LOG_KUNIT_TEST
>   	tristate "Integer log (int_log) test" if !KUNIT_ALL_TESTS
>   	depends on KUNIT
>   	default KUNIT_ALL_TESTS
> diff --git a/lib/math/tests/Makefile b/lib/math/tests/Makefile
> index 64b9bfe3381d..89a266241e98 100644
> --- a/lib/math/tests/Makefile
> +++ b/lib/math/tests/Makefile
> @@ -2,6 +2,6 @@
>   
>   obj-$(CONFIG_DIV64_KUNIT_TEST)    += div64_kunit.o
>   obj-$(CONFIG_INT_POW_KUNIT_TEST)  += int_pow_kunit.o
> -obj-$(CONFIG_INT_LOG_TEST) += int_log_kunit.o
> +obj-$(CONFIG_INT_LOG_KUNIT_TEST)  += int_log_kunit.o
>   obj-$(CONFIG_MULDIV64_KUNIT_TEST) += mul_u64_u64_div_u64_kunit.o
>   obj-$(CONFIG_RATIONAL_KUNIT_TEST) += rational_kunit.o

thanks,
-- Shuah

Re: linux-next: manual merge of the kunit-next tree with the mm tree

[Shuah Khan]

On 10/8/24 23:27, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kunit-next tree got a conflict in:
> 
>    lib/Kconfig.debug
> 
> between commit:
> 
>    0f2016a962f0 ("lib/Kconfig.debug: move int_pow test option to runtime testing section")
> 
> from the mm-nonmm-unstable branch of the mm tree and commit:
> 
>    f099bda563dd ("lib: math: Move kunit tests into tests/ subdir")
> 
> from the kunit-next 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.
> 

Andrew,
Another one related to move from lib/ lib/tests/

If you would like to take these patches - it is perfectly
fine with me. If not I can handle these.

Adding David as well for feedback on this

thanks,
-- Shuah

Re: linux-next: manual merge of the kunit-next tree with the mm tree

[Andrew Morton]

On Wed, 9 Oct 2024 09:11:19 -0600 Shuah Khan <skhan@linuxfoundation.org> wrote:

> > I fixed it up (I used the latter version of lib/math/Makefile and see
> > below the signature by the patch immediately 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.
> 
> Sorry for the delay on this. Thank you for fixing this up.
> 
> Andrew,
> 
> Looks like we might see more conflicts between mm and kunit trees
> with the move from lib/ lib/tests/
> 
> I dropped a couple of patches I couldn't apply. Would you like
> me to drop this from kunit tree?

Yes please, it's mostly a lib/ thing.

I can't actually find the original patch email.  f099bda563dd doesn't
have a Link: to the submission (please update your scripts to fix
this)  and the patch wasn't cc'ed to anything to which I subscribe
(please prefer to cc linux-kernel on most patches because of this).

Re: linux-next: manual merge of the kunit-next tree with the mm tree

[Shuah Khan]

On 10/9/24 10:28, Shuah Khan wrote:
> On 10/8/24 23:27, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the kunit-next tree got a conflict in:
>>
>>    lib/Kconfig.debug
>>
>> between commit:
>>
>>    0f2016a962f0 ("lib/Kconfig.debug: move int_pow test option to runtime testing section")
>>
>> from the mm-nonmm-unstable branch of the mm tree and commit:
>>
>>    f099bda563dd ("lib: math: Move kunit tests into tests/ subdir")
>>
>> from the kunit-next 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.
>>
> 
> Andrew,
> Another one related to move from lib/ lib/tests/
> 
> If you would like to take these patches - it is perfectly
> fine with me. If not I can handle these.

Andrew,

I dropped this one from linux-kselftest kunit branch.
The link to this patch if it isn't in your Inbox:

https://lore.kernel.org/all/20240924032200.167622-1-luis.hernandez093@gmail.com/
> 
> Adding David as well for feedback on this

David, I think lib/ kunit patches can go through Andrew's tree.
Renaming is causing merge conflicts.

thanks,
-- Shuah

Re: linux-next: manual merge of the kunit-next tree with the mm tree

[Shuah Khan]

On 10/9/24 14:42, Andrew Morton wrote:
> On Wed, 9 Oct 2024 09:11:19 -0600 Shuah Khan <skhan@linuxfoundation.org> wrote:
> 
>>> I fixed it up (I used the latter version of lib/math/Makefile and see
>>> below the signature by the patch immediately 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.
>>
>> Sorry for the delay on this. Thank you for fixing this up.
>>
>> Andrew,
>>
>> Looks like we might see more conflicts between mm and kunit trees
>> with the move from lib/ lib/tests/
>>
>> I dropped a couple of patches I couldn't apply. Would you like
>> me to drop this from kunit tree?
> 
> Yes please, it's mostly a lib/ thing.

Done.

Here is the link:

https://lore.kernel.org/all/20240924032200.167622-1-luis.hernandez093@gmail.com/
> 
> I can't actually find the original patch email.  f099bda563dd doesn't
> have a Link: to the submission (please update your scripts to fix
> this)  and the patch wasn't cc'ed to anything to which I subscribe
> (please prefer to cc linux-kernel on most patches because of this).
> 

Will do - thanks for the reminder.

thanks,
-- Shuah

Re: linux-next: manual merge of the kunit-next tree with the mm tree

[Andrew Morton]

On Wed, 9 Oct 2024 15:00:19 -0600 Shuah Khan <skhan@linuxfoundation.org> wrote:

> > Andrew,
> > Another one related to move from lib/ lib/tests/
> > 
> > If you would like to take these patches - it is perfectly
> > fine with me. If not I can handle these.
> 
> Andrew,
> 
> I dropped this one from linux-kselftest kunit branch.
> The link to this patch if it isn't in your Inbox:
> 
> https://lore.kernel.org/all/20240924032200.167622-1-luis.hernandez093@gmail.com/
> > 
> > Adding David as well for feedback on this
> 
> David, I think lib/ kunit patches can go through Andrew's tree.
> Renaming is causing merge conflicts.
> 

Cool.  David, I think it's simplest to just resend everything please.

Re: linux-next: manual merge of the kunit-next tree with the mm tree

[David Gow]

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

On Thu, 10 Oct 2024 at 05:36, Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Wed, 9 Oct 2024 15:00:19 -0600 Shuah Khan <skhan@linuxfoundation.org> wrote:
>
> > > Andrew,
> > > Another one related to move from lib/ lib/tests/
> > >
> > > If you would like to take these patches - it is perfectly
> > > fine with me. If not I can handle these.
> >
> > Andrew,
> >
> > I dropped this one from linux-kselftest kunit branch.
> > The link to this patch if it isn't in your Inbox:
> >
> > https://lore.kernel.org/all/20240924032200.167622-1-luis.hernandez093@gmail.com/
> > >
> > > Adding David as well for feedback on this
> >
> > David, I think lib/ kunit patches can go through Andrew's tree.
> > Renaming is causing merge conflicts.
> >
>
> Cool.  David, I think it's simplest to just resend everything please.

No worries: a few of these patches need some small fixes / rebases
anyway, so I'll make sure those happen and send them all as one
series.

Would you rather this be based on 6.12-rc1, or on the current
mm-nonmm-unstable branch, which has a couple of test changes already?

-- David

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 5294 bytes --]

Re: linux-next: manual merge of the kunit-next tree with the mm tree

[Andrew Morton]

On Thu, 10 Oct 2024 17:32:33 +0800 David Gow <davidgow@google.com> wrote:

> On Thu, 10 Oct 2024 at 05:36, Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > On Wed, 9 Oct 2024 15:00:19 -0600 Shuah Khan <skhan@linuxfoundation.org> wrote:
> >
> > > > Andrew,
> > > > Another one related to move from lib/ lib/tests/
> > > >
> > > > If you would like to take these patches - it is perfectly
> > > > fine with me. If not I can handle these.
> > >
> > > Andrew,
> > >
> > > I dropped this one from linux-kselftest kunit branch.
> > > The link to this patch if it isn't in your Inbox:
> > >
> > > https://lore.kernel.org/all/20240924032200.167622-1-luis.hernandez093@gmail.com/
> > > >
> > > > Adding David as well for feedback on this
> > >
> > > David, I think lib/ kunit patches can go through Andrew's tree.
> > > Renaming is causing merge conflicts.
> > >
> >
> > Cool.  David, I think it's simplest to just resend everything please.
> 
> No worries: a few of these patches need some small fixes / rebases
> anyway, so I'll make sure those happen and send them all as one
> series.
> 
> Would you rather this be based on 6.12-rc1, or on the current
> mm-nonmm-unstable branch, which has a couple of test changes already?

The latter would be convenient, thanks.