diff options
| author | Jonathan Neuschäfer <j.neuschaefer@gmx.net> | 2020-03-08 22:14:43 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2020-03-10 11:12:34 -0600 |
| commit | 19796c348ab62287fc6434f296ae279d7b97e39f (patch) | |
| tree | c7912efe1f5cfbd0ddc00471b8371cec2bc86e8d | |
| parent | 0150aedda00efe2df9156c57de63f4dea8568e8e (diff) | |
| download | linux-next-19796c348ab62287fc6434f296ae279d7b97e39f.tar.gz | |
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>
| -rw-r--r-- | Documentation/index.rst | 1 | ||||
| -rw-r--r-- | Documentation/misc-devices/index.rst | 1 | ||||
| -rw-r--r-- | Documentation/misc-devices/mic/index.rst (renamed from Documentation/mic/index.rst) | 0 | ||||
| -rw-r--r-- | Documentation/misc-devices/mic/mic_overview.rst (renamed from Documentation/mic/mic_overview.rst) | 0 | ||||
| -rw-r--r-- | Documentation/misc-devices/mic/scif_overview.rst (renamed from Documentation/mic/scif_overview.rst) | 0 | ||||
| -rw-r--r-- | MAINTAINERS | 8 |
6 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/index.rst b/Documentation/index.rst index e99d0bd2589d..6fdad61ee443 100644 --- 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 f11c5daeada5..c1dcd2628911 100644 --- 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 index 3a8d06367ef1..3a8d06367ef1 100644 --- a/Documentation/mic/index.rst +++ b/Documentation/misc-devices/mic/index.rst diff --git a/Documentation/mic/mic_overview.rst b/Documentation/misc-devices/mic/mic_overview.rst index 17d956bdaf7c..17d956bdaf7c 100644 --- a/Documentation/mic/mic_overview.rst +++ b/Documentation/misc-devices/mic/mic_overview.rst diff --git a/Documentation/mic/scif_overview.rst b/Documentation/misc-devices/mic/scif_overview.rst index 4c8ad9e43706..4c8ad9e43706 100644 --- a/Documentation/mic/scif_overview.rst +++ b/Documentation/misc-devices/mic/scif_overview.rst diff --git a/MAINTAINERS b/MAINTAINERS index 38fe2f3f7b6f..083fcf1a151c 100644 --- 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> |