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
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
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
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.
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
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.
© 2016 - 2024 Red Hat, Inc.