Messages in this thread | | | Date | Thu, 14 May 2015 14:35:16 +1000 | From | Stephen Rothwell <> | Subject | 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" bug") from the tip tree.
I fixed it up (I removed the file) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |