summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-06-27 11:59:40 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-07-15 10:03:02 -0400
commit83bbf6e103544d65f17f4b2ccea1c6a51c0b0769 (patch)
tree9f37eb8ea225fc60312ba26b43522c420634da53
parentdf1b7ce784c220373d202ea9f8bc0c424f2c9f7c (diff)
docs: aoe: add it to the driver-api book
Those files belong to the admin guide, so add them. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Acked-by: Justin Sanders <justin@coraid.com>
-rw-r--r--Documentation/admin-guide/aoe/aoe.rst (renamed from Documentation/aoe/aoe.rst)4
-rw-r--r--Documentation/admin-guide/aoe/autoload.sh (renamed from Documentation/aoe/autoload.sh)0
-rw-r--r--Documentation/admin-guide/aoe/examples.rst (renamed from Documentation/aoe/examples.rst)0
-rw-r--r--Documentation/admin-guide/aoe/index.rst (renamed from Documentation/aoe/index.rst)2
-rw-r--r--Documentation/admin-guide/aoe/status.sh (renamed from Documentation/aoe/status.sh)0
-rw-r--r--Documentation/admin-guide/aoe/todo.rst (renamed from Documentation/aoe/todo.rst)0
-rw-r--r--Documentation/admin-guide/aoe/udev-install.sh (renamed from Documentation/aoe/udev-install.sh)0
-rw-r--r--Documentation/admin-guide/aoe/udev.txt (renamed from Documentation/aoe/udev.txt)2
-rw-r--r--Documentation/admin-guide/index.rst1
-rw-r--r--MAINTAINERS2
10 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/aoe/aoe.rst b/Documentation/admin-guide/aoe/aoe.rst
index 58747ecec71d..a05e751363a0 100644
--- a/Documentation/aoe/aoe.rst
+++ b/Documentation/admin-guide/aoe/aoe.rst
@@ -20,7 +20,7 @@ driver. The aoetools are on sourceforge.
20 20
21 http://aoetools.sourceforge.net/ 21 http://aoetools.sourceforge.net/
22 22
23The scripts in this Documentation/aoe directory are intended to 23The scripts in this Documentation/admin-guide/aoe directory are intended to
24document the use of the driver and are not necessary if you install 24document the use of the driver and are not necessary if you install
25the aoetools. 25the aoetools.
26 26
@@ -86,7 +86,7 @@ Using sysfs
86 a convenient way. Users with aoetools should use the aoe-stat 86 a convenient way. Users with aoetools should use the aoe-stat
87 command:: 87 command::
88 88
89 root@makki root# sh Documentation/aoe/status.sh 89 root@makki root# sh Documentation/admin-guide/aoe/status.sh
90 e10.0 eth3 up 90 e10.0 eth3 up
91 e10.1 eth3 up 91 e10.1 eth3 up
92 e10.2 eth3 up 92 e10.2 eth3 up
diff --git a/Documentation/aoe/autoload.sh b/Documentation/admin-guide/aoe/autoload.sh
index 815dff4691c9..815dff4691c9 100644
--- a/Documentation/aoe/autoload.sh
+++ b/Documentation/admin-guide/aoe/autoload.sh
diff --git a/Documentation/aoe/examples.rst b/Documentation/admin-guide/aoe/examples.rst
index 91f3198e52c1..91f3198e52c1 100644
--- a/Documentation/aoe/examples.rst
+++ b/Documentation/admin-guide/aoe/examples.rst
diff --git a/Documentation/aoe/index.rst b/Documentation/admin-guide/aoe/index.rst
index 4394b9b7913c..d71c5df15922 100644
--- a/Documentation/aoe/index.rst
+++ b/Documentation/admin-guide/aoe/index.rst
@@ -1,5 +1,3 @@
1:orphan:
2
3======================= 1=======================
4ATA over Ethernet (AoE) 2ATA over Ethernet (AoE)
5======================= 3=======================
diff --git a/Documentation/aoe/status.sh b/Documentation/admin-guide/aoe/status.sh
index eeec7baae57a..eeec7baae57a 100644
--- a/Documentation/aoe/status.sh
+++ b/Documentation/admin-guide/aoe/status.sh
diff --git a/Documentation/aoe/todo.rst b/Documentation/admin-guide/aoe/todo.rst
index dea8db5a33e1..dea8db5a33e1 100644
--- a/Documentation/aoe/todo.rst
+++ b/Documentation/admin-guide/aoe/todo.rst
diff --git a/Documentation/aoe/udev-install.sh b/Documentation/admin-guide/aoe/udev-install.sh
index 15e86f58c036..15e86f58c036 100644
--- a/Documentation/aoe/udev-install.sh
+++ b/Documentation/admin-guide/aoe/udev-install.sh
diff --git a/Documentation/aoe/udev.txt b/Documentation/admin-guide/aoe/udev.txt
index 54feda5a0772..5fb756466bc7 100644
--- a/Documentation/aoe/udev.txt
+++ b/Documentation/admin-guide/aoe/udev.txt
@@ -11,7 +11,7 @@
11# udev_rules="/etc/udev/rules.d/" 11# udev_rules="/etc/udev/rules.d/"
12# bash# ls /etc/udev/rules.d/ 12# bash# ls /etc/udev/rules.d/
13# 10-wacom.rules 50-udev.rules 13# 10-wacom.rules 50-udev.rules
14# bash# cp /path/to/linux/Documentation/aoe/udev.txt \ 14# bash# cp /path/to/linux/Documentation/admin-guide/aoe/udev.txt \
15# /etc/udev/rules.d/60-aoe.rules 15# /etc/udev/rules.d/60-aoe.rules
16# 16#
17 17
diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst
index 9228fbf5ce4e..1f0d9b939311 100644
--- a/Documentation/admin-guide/index.rst
+++ b/Documentation/admin-guide/index.rst
@@ -83,6 +83,7 @@ configure specific aspects of kernel behavior to your liking.
83 namespaces/index 83 namespaces/index
84 perf-security 84 perf-security
85 acpi/index 85 acpi/index
86 aoe/index
86 device-mapper/index 87 device-mapper/index
87 laptops/index 88 laptops/index
88 89
diff --git a/MAINTAINERS b/MAINTAINERS
index 3feb318e1433..0c603ea73034 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2689,7 +2689,7 @@ ATA OVER ETHERNET (AOE) DRIVER
2689M: "Justin Sanders" <justin@coraid.com> 2689M: "Justin Sanders" <justin@coraid.com>
2690W: http://www.openaoe.org/ 2690W: http://www.openaoe.org/
2691S: Supported 2691S: Supported
2692F: Documentation/aoe/ 2692F: Documentation/admin-guide/aoe/
2693F: drivers/block/aoe/ 2693F: drivers/block/aoe/
2694 2694
2695ATHEROS 71XX/9XXX GPIO DRIVER 2695ATHEROS 71XX/9XXX GPIO DRIVER