On 8/5/20 12:00 AM, Linus Torvalds wrote:

On Tue, Aug 4, 2020 at 2:56 PM Shuah Khan skhan@linuxfoundation.org wrote:

...

Please pull the following Kselftest update for Linux 5.9-rc1.

Shortlog? diffstat? And the actual git address to pull from?

I see the attached diff, and I'm sure I could guess what branch you want me to pull from, but please do a proper pull request.

         Linus

My apologies. I was so focused on summarizing the conflict between the commits, I messed up the pull request text. Let me try this again.

Please pull the following Kselftest update for Linux 5.9-rc1.

This Kselftest update for Linux 5.9-rc1 consists of

- TAP output reporting related fixes from Paolo Bonzini and Kees Cook. These fixes make it skip reporting consistent with TAP format. - Cleanup fixes to framework run_tests from Yauheni Kaliuta

diff is attached.

thanks, -- Shuah

---------------------------------------------------------------- The following changes since commit 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68:

Linux 5.8-rc3 (2020-06-28 15:00:24 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.9-rc1

for you to fetch changes up to 850d0cc64c8e2e0895acf735ac0a53c78b80dbe5:

selftests/harness: Limit step counter reporting (2020-07-17 13:56:35 -0600)

---------------------------------------------------------------- linux-kselftest-5.9-rc1

This Kselftest update for Linux 5.9-rc1 consists of

- TAP output reporting related fixes from Paolo Bonzini and Kees Cook. These fixes make it skip reporting consistent with TAP format. - Cleanup fixes to framework run_tests from Yauheni Kaliuta

---------------------------------------------------------------- Alexander A. Klimov (1): Replace HTTP links with HTTPS ones: KMOD KERNEL MODULE LOADER - USERMODE HELPER

Kees Cook (13): selftests/clone3: Reorder reporting output selftests: Remove unneeded selftest API headers selftests/binderfs: Fix harness API usage selftests: Add header documentation and helpers selftests/harness: Switch to TAP output selftests/harness: Refactor XFAIL into SKIP selftests/harness: Display signed values correctly selftests/harness: Report skip reason selftests: kmod: Add module address visibility test selftests/harness: Clean up kern-doc for fixtures selftests/seccomp: Refactor to use fixture variants selftests/seccomp: Check ENOSYS under tracing selftests/harness: Limit step counter reporting

Paolo Bonzini (7): kselftest: fix TAP output for skipped tests selftests: breakpoints: fix computation of test plan selftests: breakpoints: do not use ksft_exit_skip after ksft_set_plan selftests: sigaltstack: do not use ksft_exit_skip after ksft_set_plan selftests: sync_test: do not use ksft_exit_skip after ksft_set_plan selftests: pidfd: do not use ksft_exit_skip after ksft_set_plan selftests: pidfd: skip test if unshare fails with EPERM

Yauheni Kaliuta (2): selftests: do not use .ONESHELL selftests: fix condition in run_tests .../breakpoints/step_after_suspend_test.c | 53 ++-- tools/testing/selftests/clone3/clone3.c | 2 +- .../selftests/clone3/clone3_clear_sighand.c | 3 +- tools/testing/selftests/clone3/clone3_set_tid.c | 2 +- .../selftests/filesystems/binderfs/binderfs_test.c | 284 +++++++++++---------- tools/testing/selftests/kmod/kmod.sh | 38 ++- tools/testing/selftests/kselftest.h | 106 +++++++- tools/testing/selftests/kselftest/runner.sh | 2 +- tools/testing/selftests/kselftest_harness.h | 181 +++++++++---- tools/testing/selftests/lib.mk | 20 +- .../selftests/pid_namespace/regression_enomem.c | 1 - tools/testing/selftests/pidfd/pidfd_getfd_test.c | 1 - tools/testing/selftests/pidfd/pidfd_setns_test.c | 1 - tools/testing/selftests/pidfd/pidfd_test.c | 55 +++- tools/testing/selftests/seccomp/seccomp_bpf.c | 225 +++++----------- tools/testing/selftests/sigaltstack/sas.c | 4 +- tools/testing/selftests/sync/sync_test.c | 2 +- tools/testing/selftests/uevent/uevent_filtering.c | 1 - 18 files changed, 570 insertions(+), 411 deletions(-)

----------------------------------------------------------------

On 8/5/20 11:32 AM, Linus Torvalds wrote:

On Wed, Aug 5, 2020 at 7:13 AM Shuah Khan skhan@linuxfoundation.org wrote:

...

Please pull the following Kselftest update for Linux 5.9-rc1.

Ok, it worked fine this time, although now you lost the note about the conflict ;)

Sorry about that. I should have included that as well.

I took the version from the seccomp tree that seemed to be the slightly cleaned-up one.

Yes. The version from seccomp tree is the one to pick up. Thanks for working through this.

thanks, -- Shuah