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

Hi all, Today's linux-next merge of the tip tree got a conflict in: Documentation/x86/index.rst between commit: ed13a92d0fde ("docs: archis: add a per-architecture features list") from the jc_docs tree and commit: 3fa97bf00126 ("Documentation/x86: Document SGX kernel architecture") fro

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

Hi all, Today's linux-next merge of the tip tree got a conflict in: Documentation/trace/ftrace.txt between commit: 1f198e22bc3a ("trace doc: convert trace/ftrace.txt to rst format") from the jc_docs tree and commit: 92af4dcb4e1c ("tracing: Unify the "boot" and "mono" tracing clocks") f

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

Hi all, With the merge window opening, just a reminder that this conflict still exists. On Wed, 21 Jun 2017 14:18:09 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > Documentation/DocBook/kernel-hacking.tmpl > > between commit: > > c4fcd7c

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

Hi all, Today's linux-next merge of the tip tree got a conflict in: Documentation/DocBook/kernel-hacking.tmpl between commit: c4fcd7cabb83 ("docs-rst: convert kernel-hacking to ReST") from the jc_docs tree and commit: ac6424b981bc ("sched/wait: Rename wait_queue_t => wait_queue_entry_t"