Re: linux-next: manual merge of the tip tree with the kselftest-fixes tree

* Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > tools/testing/selftests/x86/run_x86_tests.sh between commit > c1e6e5cb941b ("selftests, x86: Remove useless run_tests rule") from > the kselftest-fixes tree and commit e22438f8e997 ("x86, sel

linux-next: manual merge of the tip tree with the kselftest-fixes tree

Hi all, Today's linux-next merge of the tip tree got a conflict in tools/testing/selftests/x86/run_x86_tests.sh between commit c1e6e5cb941b ("selftests, x86: Remove useless run_tests rule") from the kselftest-fixes tree and commit e22438f8e997 ("x86, selftests: Add a test for the "sysret_ss_attrs"

linux-next: manual merge of the tip tree with the kselftest-fixes tree

Hi all, Today's linux-next merge of the tip tree got a conflict in tools/testing/selftests/x86/Makefile between commit e9886ace222e ("selftests, x86: Rework x86 target architecture detection") from the kselftest-fixes tree and commit e22438f8e997 ("x86, selftests: Add a test for the "sysret_ss_att