Merge tag 'edac_urgent_for_v6.15_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

792b8307 · Linus Torvalds <[email protected]> · 2025-04-01 17:46:45 -07:00

Pull EDAC documentation fix from Borislav Petkov:

 - A single fix making sure the EDAC subtree is included in the
   documentation table of contents

* tag 'edac_urgent_for_v6.15_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  Documentation/EDAC: Fix warning document isn't included in any toctree

Commit: 792b8307ecd237ba719736c5310430cff3dd2296
Parents: 8868485d · 212120a1

Merge commit. Changes below are compared with the first parent: 8868485d.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
Documentation/subsystem-apis.rst	modified	+1	−0	View file

Documentation/subsystem-apis.rst

View file

diff --git a/Documentation/subsystem-apis.rst b/Documentation/subsystem-apis.rst
index b52ad5b..ff4fe8c 100644
--- a/Documentation/subsystem-apis.rst
+++ b/Documentation/subsystem-apis.rst
@@ -71,6 +71,7 @@ Other subsystems
 
    accounting/index
    cpu-freq/index
+   edac/index
    fpga/index
    i2c/index
    iio/index