linux-next: manual merge of the kselftest tree with the jc_docs tree

2017-06-06 Thread Stephen Rothwell
Hi Shuah, Today's linux-next merge of the kselftest tree got a conflict in: MAINTAINERS between commit: c061f33f35be ("doc: ReSTify seccomp_filter.txt") from the jc_docs tree and commit: 11fe3c3f54f9 ("selftests: Make test_harness.h more generally available") from the kselftest tree.

linux-next: manual merge of the kselftest tree with the jc_docs tree

2017-06-06 Thread Stephen Rothwell
Hi Shuah, Today's linux-next merge of the kselftest tree got a conflict in: Documentation/dev-tools/index.rst between commit: 7fb2e8a49037 ("docs-rst: convert kgdb DocBook to ReST") from the jc_docs tree and commit: 5714b6531b49 ("Documentation/dev-tools: Use reStructuredText markups fo