Messages in this thread | | | Date | Thu, 7 Jun 2018 11:53:50 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
tools/testing/selftests/Makefile
between commit:
a12ab9e125f1 ("selftests: move RTC tests to rtc subfolder")
from Linus' tree and commit:
ccba8b64452b ("rseq/selftests: Provide Makefile, scripts, gitignore")
from the tip 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 tools/testing/selftests/Makefile index 4cd339b5366a,593fb44c9cd4..000000000000 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@@ -29,7 -28,7 +29,8 @@@ TARGETS += powerp TARGETS += proc TARGETS += pstore TARGETS += ptrace + TARGETS += rseq +TARGETS += rtc TARGETS += seccomp TARGETS += sigaltstack TARGETS += size [unhandled content-type:application/pgp-signature] | |