From: Linus Torvalds Date: Mon, 1 Jun 2020 22:45:27 +0000 (-0700) Subject: Merge tag 'docs-5.8' of git://git.lwn.net/linux X-Git-Tag: v5.15~3769 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b23c4771ff62de8ca9b5e4a2d64491b2fb6f8f69;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'docs-5.8' of git://git.lwn.net/linux Pull documentation updates from Jonathan Corbet: "A fair amount of stuff this time around, dominated by yet another massive set from Mauro toward the completion of the RST conversion. I *really* hope we are getting close to the end of this. Meanwhile, those patches reach pretty far afield to update document references around the tree; there should be no actual code changes there. There will be, alas, more of the usual trivial merge conflicts. Beyond that we have more translations, improvements to the sphinx scripting, a number of additions to the sysctl documentation, and lots of fixes" * tag 'docs-5.8' of git://git.lwn.net/linux: (130 commits) Documentation: fixes to the maintainer-entry-profile template zswap: docs/vm: Fix typo accept_threshold_percent in zswap.rst tracing: Fix events.rst section numbering docs: acpi: fix old http link and improve document format docs: filesystems: add info about efivars content Documentation: LSM: Correct the basic LSM description mailmap: change email for Ricardo Ribalda docs: sysctl/kernel: document unaligned controls Documentation: admin-guide: update bug-hunting.rst docs: sysctl/kernel: document ngroups_max nvdimm: fixes to maintainter-entry-profile Documentation/features: Correct RISC-V kprobes support entry Documentation/features: Refresh the arch support status files Revert "docs: sysctl/kernel: document ngroups_max" docs: move locking-specific documents to locking/ docs: move digsig docs to the security book docs: move the kref doc into the core-api book docs: add IRQ documentation at the core-api book docs: debugging-via-ohci1394.txt: add it to the core-api book docs: fix references for ipmi.rst file ... --- b23c4771ff62de8ca9b5e4a2d64491b2fb6f8f69 diff --cc Documentation/arm64/booting.rst index d063c05d,e501860..7552dbc --- a/Documentation/arm64/booting.rst +++ b/Documentation/arm64/booting.rst @@@ -173,8 -173,9 +173,10 @@@ Before jumping into the kernel, the fol - Caches, MMUs The MMU must be off. + - Instruction cache may be on or off. + The instruction cache may be on or off, and must not hold any stale + entries corresponding to the loaded kernel image. + The address range corresponding to the loaded kernel image must be cleaned to the PoC. In the presence of a system cache or other coherent masters with caches enabled, this will typically require diff --cc MAINTAINERS index 47341fb,f967ba8..ca99126 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -7046,19 -7029,8 +7046,19 @@@ F: include/linux/futex. F: include/uapi/linux/futex.h F: kernel/futex.c F: tools/perf/bench/futex* - F: tools/testing/selftests/futex/ + F: Documentation/locking/*futex* +GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER +M: Tim Harvey +M: Robert Jones +S: Maintained +F: Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml +F: drivers/mfd/gateworks-gsc.c +F: include/linux/mfd/gsc.h +F: Documentation/hwmon/gsc-hwmon.rst +F: drivers/hwmon/gsc-hwmon.c +F: include/linux/platform_data/gsc_hwmon.h + GASKET DRIVER FRAMEWORK M: Rob Springer M: Todd Poynor