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

2020-07-05 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the jc_docs tree got a conflict in: Documentation/arm64/index.rst between commit: 5c5a8ac9b27b ("arm64: mte: Add Memory Tagging Extension documentation") from the arm64 tree and commit: 86de78d2c5f4 ("docs: arm64: convert perf.txt to ReST format") fr

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

2020-04-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the jc_docs tree got a conflict in: Documentation/arm64/booting.rst between commit: e24e03aa00f0 ("arm64: docs: Mandate that the I-cache doesn't hold stale kernel text") from the arm64 tree and commit: 877a37d31e0f ("docs: arm64: booting.rst: get rid