lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 19 Oct 2021 14:40:34 -0700 From: Daniel Latypov <dlatypov@...gle.com> To: Shuah Khan <skhan@...uxfoundation.org> Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, Brendan Higgins <brendanhiggins@...gle.com> Subject: Re: linux-next: manual merge of the kunit-next tree with the kunit-fixes tree On Tue, Oct 19, 2021 at 2:26 PM Shuah Khan <skhan@...uxfoundation.org> wrote: > > On 10/8/21 10:31 AM, Shuah Khan wrote: > > On 10/7/21 10:29 PM, Stephen Rothwell wrote: > >> Hi all, > >> > >> Today's linux-next merge of the kunit-next tree got a conflict in: > >> > >> tools/testing/kunit/kunit.py > >> > >> between commit: > >> > >> d8c23ead708b ("kunit: tool: better handling of quasi-bool args (--json, --raw_output)") > >> > >> from the kunit-fixes tree and commit: > >> > >> 6710951ee039 ("kunit: tool: support running each suite/test separately") > >> > >> 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. > >> > > > > Thank you for the fixing it up. I will fix this up in the kunit-next once > > the kunit-fixes pull request goes out. > > > > I fixed the merge conflict in kunit-next tree after rebase to Linux 5.15-rc6. > There is no need to carry this fix. > > Daniel! Please review to see if it looks good. It was very minor fix-up. ff9e09a3762fbd7aba83cfd1530972b57ae52b3b looks good to me. Thanks, Shuah! To be extra safe, I checked Test that test-level filtering and hermetic testing work as expected $ ./tools/testing/kunit/kunit.py run --run_isolated=suite '*ex*.*skipped*' $ ./tools/testing/kunit/kunit.py run --run_isolated=suite '*ex*.*s[iu]*' kunit.py's unit test: $ ./tools/testing/kunit/kunit_tool_test.py Type-checkers: $ pytype ./tools/testing/kunit/*.py $ mypy ./tools/testing/kunit/*.py # this had the expected errors > > - from typing import Iterable, Sequence > -from typing import Iterable, List > ++from typing import Iterable, Sequence, List > > thanks, > -- Shuah >
Powered by blists - more mailing lists