docs: Move Intel Many Integrated Core documentation (mic) under misc-devices

It doesn't need to be a top-level chapter.

This patch also updates MAINTAINERS and makes sure the F: lines are
properly sorted.

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20200308211519.8414-1-j.neuschaefer@gmx.net
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

diff --git a/Documentation/index.rst b/Documentation/index.rst
index e99d0bd2589d89916280b0a0e917bfa81b2ee542..6fdad61ee443cd94355959f6db06a228d98defa9 100644 (file)
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -131,7 +131,6 @@ needed).
    usb/index
    PCI/index
    misc-devices/index
-   mic/index
    scheduler/index
 
 Architecture-agnostic documentation

diff --git a/Documentation/misc-devices/index.rst b/Documentation/misc-devices/index.rst
index f11c5daeada5485f04767fbe707eaa92dc2e2a0f..c1dcd262891188488843821ed12a1c0037a825ca 100644 (file)
--- a/Documentation/misc-devices/index.rst
+++ b/Documentation/misc-devices/index.rst
@@ -20,4 +20,5 @@ fit into other categories.
    isl29003
    lis3lv02d
    max6875
+   mic/index
    xilinx_sdfec

diff --git a/Documentation/mic/index.rst b/Documentation/misc-devices/mic/index.rst
similarity index 100%
rename from Documentation/mic/index.rst
rename to Documentation/misc-devices/mic/index.rst

diff --git a/Documentation/mic/mic_overview.rst b/Documentation/misc-devices/mic/mic_overview.rst
similarity index 100%
rename from Documentation/mic/mic_overview.rst
rename to Documentation/misc-devices/mic/mic_overview.rst

diff --git a/Documentation/mic/scif_overview.rst b/Documentation/misc-devices/mic/scif_overview.rst
similarity index 100%
rename from Documentation/mic/scif_overview.rst
rename to Documentation/misc-devices/mic/scif_overview.rst

diff --git a/MAINTAINERS b/MAINTAINERS
index 38fe2f3f7b6f290e67168db75a1881cfbcc5be8b..083fcf1a151c20b43a67655187e0d4bacdbf2dca 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8569,15 +8569,15 @@ M:      Ashutosh Dixit <ashutosh.dixit@intel.com>
 S:     Supported
 W:     https://github.com/sudeepdutt/mic
 W:     http://software.intel.com/en-us/mic-developer
+F:     Documentation/misc-devices/mic/
+F:     drivers/dma/mic_x100_dma.c
+F:     drivers/dma/mic_x100_dma.h
+F:     drivers/misc/mic/
 F:     include/linux/mic_bus.h
 F:     include/linux/scif.h
 F:     include/uapi/linux/mic_common.h
 F:     include/uapi/linux/mic_ioctl.h
 F:     include/uapi/linux/scif_ioctl.h
-F:     drivers/misc/mic/
-F:     drivers/dma/mic_x100_dma.c
-F:     drivers/dma/mic_x100_dma.h
-F:     Documentation/mic/
 
 INTEL PMC CORE DRIVER
 M:     Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>