summaryrefslogtreecommitdiff
path: root/Documentation/core-api
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2018-07-02 20:14:50 +0300
committerJonathan Corbet <corbet@lwn.net>2018-07-02 20:14:50 +0300
commit5f6654094ff35a7a92eb76667788ef633595e4ea (patch)
tree8404c5fb245cddbc6877b97a9bf53139c95da852 /Documentation/core-api
parent5105730fbf6789ff9e20837bdefe32e8ba133595 (diff)
parent021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff)
downloadlinux-5f6654094ff35a7a92eb76667788ef633595e4ea.tar.xz
Merge tag 'v4.18-rc3' into docs-next
-rc1 broke the docs build due to changes in the e100/e1000 drivers; -rc3 got the fixes via the networking tree. Pull in -rc3 so that the docs tree can actually build the docs again.
Diffstat (limited to 'Documentation/core-api')
-rw-r--r--Documentation/core-api/kernel-api.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/core-api/kernel-api.rst b/Documentation/core-api/kernel-api.rst
index 8e44aea366c2..76fe2d0f5e7d 100644
--- a/Documentation/core-api/kernel-api.rst
+++ b/Documentation/core-api/kernel-api.rst
@@ -284,7 +284,7 @@ Resources Management
MTRR Handling
-------------
-.. kernel-doc:: arch/x86/kernel/cpu/mtrr/main.c
+.. kernel-doc:: arch/x86/kernel/cpu/mtrr/mtrr.c
:export:
Security Framework