[PATCH 0/6] Documentation: arch reorg (continued)

[PATCH 0/6] Documentation: arch reorg (continued)

[Jonathan Corbet]

This series builds on top of the documentation reorganization posted at

    https://lore.kernel.org/lkml/20230315211523.108836-1-corbet@lwn.net/

it adds several more architectures (the relatively inactive ones) to the
new arch/ directory.  This series goes on top of the previous one.

The cover letter from that series provides the motivation for this work:

    The top-level Documentation/ directory, despite the efforts of the last
    few years, is still a mess; there is too much stuff there, making it
    harder to find anything.  We do not organize our source directories
    that way, and for good reasons.

Jonathan Corbet (6):
  docs: zh_CN: create the architecture-specific top-level directory
  docs: move xtensa documentation under Documentation/arch/
  docs: move sparc documentation under Documentation/arch/
  docs: move superh documentation under Documentation/arch/
  docs: move openrisc documentation under Documentation/arch/
  docs: move nios2 documentation under Documentation/arch/

 Documentation/arch/index.rst                           | 10 +++++-----
 Documentation/{ => arch}/nios2/features.rst            |  0
 Documentation/{ => arch}/nios2/index.rst               |  0
 Documentation/{ => arch}/nios2/nios2.rst               |  0
 Documentation/{ => arch}/openrisc/features.rst         |  0
 Documentation/{ => arch}/openrisc/index.rst            |  0
 Documentation/{ => arch}/openrisc/openrisc_port.rst    |  0
 Documentation/{ => arch}/openrisc/todo.rst             |  0
 Documentation/{ => arch}/sh/booting.rst                |  0
 Documentation/{ => arch}/sh/features.rst               |  0
 Documentation/{ => arch}/sh/index.rst                  |  0
 Documentation/{ => arch}/sh/new-machine.rst            |  0
 Documentation/{ => arch}/sh/register-banks.rst         |  0
 Documentation/{ => arch}/sparc/adi.rst                 |  0
 Documentation/{ => arch}/sparc/console.rst             |  0
 Documentation/{ => arch}/sparc/features.rst            |  0
 Documentation/{ => arch}/sparc/index.rst               |  0
 Documentation/{ => arch}/sparc/oradax/dax-hv-api.txt   |  0
 Documentation/{ => arch}/sparc/oradax/oracle-dax.rst   |  0
 Documentation/{ => arch}/xtensa/atomctl.rst            |  0
 Documentation/{ => arch}/xtensa/booting.rst            |  0
 Documentation/{ => arch}/xtensa/features.rst           |  0
 Documentation/{ => arch}/xtensa/index.rst              |  0
 Documentation/{ => arch}/xtensa/mmu.rst                |  0
 .../translations/zh_CN/{arch.rst => arch/index.rst}    | 10 +++++-----
 .../translations/zh_CN/{ => arch}/openrisc/index.rst   |  4 ++--
 .../zh_CN/{ => arch}/openrisc/openrisc_port.rst        |  4 ++--
 .../translations/zh_CN/{ => arch}/openrisc/todo.rst    |  4 ++--
 Documentation/translations/zh_CN/index.rst             |  2 +-
 MAINTAINERS                                            |  4 ++--
 arch/sh/Kconfig.cpu                                    |  2 +-
 arch/xtensa/include/asm/initialize_mmu.h               |  2 +-
 drivers/sbus/char/oradax.c                             |  2 +-
 33 files changed, 22 insertions(+), 22 deletions(-)
 rename Documentation/{ => arch}/nios2/features.rst (100%)
 rename Documentation/{ => arch}/nios2/index.rst (100%)
 rename Documentation/{ => arch}/nios2/nios2.rst (100%)
 rename Documentation/{ => arch}/openrisc/features.rst (100%)
 rename Documentation/{ => arch}/openrisc/index.rst (100%)
 rename Documentation/{ => arch}/openrisc/openrisc_port.rst (100%)
 rename Documentation/{ => arch}/openrisc/todo.rst (100%)
 rename Documentation/{ => arch}/sh/booting.rst (100%)
 rename Documentation/{ => arch}/sh/features.rst (100%)
 rename Documentation/{ => arch}/sh/index.rst (100%)
 rename Documentation/{ => arch}/sh/new-machine.rst (100%)
 rename Documentation/{ => arch}/sh/register-banks.rst (100%)
 rename Documentation/{ => arch}/sparc/adi.rst (100%)
 rename Documentation/{ => arch}/sparc/console.rst (100%)
 rename Documentation/{ => arch}/sparc/features.rst (100%)
 rename Documentation/{ => arch}/sparc/index.rst (100%)
 rename Documentation/{ => arch}/sparc/oradax/dax-hv-api.txt (100%)
 rename Documentation/{ => arch}/sparc/oradax/oracle-dax.rst (100%)
 rename Documentation/{ => arch}/xtensa/atomctl.rst (100%)
 rename Documentation/{ => arch}/xtensa/booting.rst (100%)
 rename Documentation/{ => arch}/xtensa/features.rst (100%)
 rename Documentation/{ => arch}/xtensa/index.rst (100%)
 rename Documentation/{ => arch}/xtensa/mmu.rst (100%)
 rename Documentation/translations/zh_CN/{arch.rst => arch/index.rst} (77%)
 rename Documentation/translations/zh_CN/{ => arch}/openrisc/index.rst (79%)
 rename Documentation/translations/zh_CN/{ => arch}/openrisc/openrisc_port.rst (97%)
 rename Documentation/translations/zh_CN/{ => arch}/openrisc/todo.rst (88%)

-- 
2.39.2

[PATCH 1/6] docs: zh_CN: create the architecture-specific top-level directory

[Jonathan Corbet]

This mirrors commit 4f1bb0386dfc ("docs: create a top-level arch/
directory"), creating a top-level directory to hold architecture-specific
documentation.

Cc: Alex Shi <alexs@kernel.org>
Cc: Yanteng Si <siyanteng@loongson.cn>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
 .../translations/zh_CN/{arch.rst => arch/index.rst}  | 12 ++++++------
 Documentation/translations/zh_CN/index.rst           |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename Documentation/translations/zh_CN/{arch.rst => arch/index.rst} (72%)

diff --git a/Documentation/translations/zh_CN/arch.rst b/Documentation/translations/zh_CN/arch/index.rst
similarity index 72%
rename from Documentation/translations/zh_CN/arch.rst
rename to Documentation/translations/zh_CN/arch/index.rst
index 690e173d8b2a..aa53dcff268e 100644
--- a/Documentation/translations/zh_CN/arch.rst
+++ b/Documentation/translations/zh_CN/arch/index.rst
@@ -8,12 +8,12 @@
 .. toctree::
    :maxdepth: 2
 
-   mips/index
-   arm64/index
-   riscv/index
-   openrisc/index
-   parisc/index
-   loongarch/index
+   ../mips/index
+   ../arm64/index
+   ../riscv/index
+   ../openrisc/index
+   ../parisc/index
+   ../loongarch/index
 
 TODOList:
 
diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
index 7c3216845b71..299704c0818d 100644
--- a/Documentation/translations/zh_CN/index.rst
+++ b/Documentation/translations/zh_CN/index.rst
@@ -120,7 +120,7 @@ TODOList:
 .. toctree::
    :maxdepth: 2
 
-   arch
+   arch/index
 
 其他文档
 --------
-- 
2.39.2

Re: [PATCH 1/6] docs: zh_CN: create the architecture-specific top-level directory

[Alex Shi]

On Fri, Mar 24, 2023 at 6:20 AM Jonathan Corbet <corbet@lwn.net> wrote:
>
> This mirrors commit 4f1bb0386dfc ("docs: create a top-level arch/
> directory"), creating a top-level directory to hold architecture-specific
> documentation.
>
> Cc: Alex Shi <alexs@kernel.org>
> Cc: Yanteng Si <siyanteng@loongson.cn>
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>

Thanks alot for take core!

Acked-by: Alex Shi <alexs@kernel.org>

> ---
>  .../translations/zh_CN/{arch.rst => arch/index.rst}  | 12 ++++++------
>  Documentation/translations/zh_CN/index.rst           |  2 +-
>  2 files changed, 7 insertions(+), 7 deletions(-)
>  rename Documentation/translations/zh_CN/{arch.rst => arch/index.rst} (72%)
>
> diff --git a/Documentation/translations/zh_CN/arch.rst b/Documentation/translations/zh_CN/arch/index.rst
> similarity index 72%
> rename from Documentation/translations/zh_CN/arch.rst
> rename to Documentation/translations/zh_CN/arch/index.rst
> index 690e173d8b2a..aa53dcff268e 100644
> --- a/Documentation/translations/zh_CN/arch.rst
> +++ b/Documentation/translations/zh_CN/arch/index.rst
> @@ -8,12 +8,12 @@
>  .. toctree::
>     :maxdepth: 2
>
> -   mips/index
> -   arm64/index
> -   riscv/index
> -   openrisc/index
> -   parisc/index
> -   loongarch/index
> +   ../mips/index
> +   ../arm64/index
> +   ../riscv/index
> +   ../openrisc/index
> +   ../parisc/index
> +   ../loongarch/index
>
>  TODOList:
>
> diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
> index 7c3216845b71..299704c0818d 100644
> --- a/Documentation/translations/zh_CN/index.rst
> +++ b/Documentation/translations/zh_CN/index.rst
> @@ -120,7 +120,7 @@ TODOList:
>  .. toctree::
>     :maxdepth: 2
>
> -   arch
> +   arch/index
>
>  其他文档
>  --------
> --
> 2.39.2
>

Re: [PATCH 1/6] docs: zh_CN: create the architecture-specific top-level directory

[Yanteng Si]

在 3/24/23 06:19, Jonathan Corbet 写道:
> This mirrors commit 4f1bb0386dfc ("docs: create a top-level arch/
> directory"), creating a top-level directory to hold architecture-specific
> documentation.
>
> Cc: Alex Shi <alexs@kernel.org>
> Cc: Yanteng Si <siyanteng@loongson.cn>
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Reviewed-by: Yanteng Si <siyanteng@loongson.cn>


Thanks,

Yanteng
> ---
>   .../translations/zh_CN/{arch.rst => arch/index.rst}  | 12 ++++++------
>   Documentation/translations/zh_CN/index.rst           |  2 +-
>   2 files changed, 7 insertions(+), 7 deletions(-)
>   rename Documentation/translations/zh_CN/{arch.rst => arch/index.rst} (72%)
>
> diff --git a/Documentation/translations/zh_CN/arch.rst b/Documentation/translations/zh_CN/arch/index.rst
> similarity index 72%
> rename from Documentation/translations/zh_CN/arch.rst
> rename to Documentation/translations/zh_CN/arch/index.rst
> index 690e173d8b2a..aa53dcff268e 100644
> --- a/Documentation/translations/zh_CN/arch.rst
> +++ b/Documentation/translations/zh_CN/arch/index.rst
> @@ -8,12 +8,12 @@
>   .. toctree::
>      :maxdepth: 2
>   
> -   mips/index
> -   arm64/index
> -   riscv/index
> -   openrisc/index
> -   parisc/index
> -   loongarch/index
> +   ../mips/index
> +   ../arm64/index
> +   ../riscv/index
> +   ../openrisc/index
> +   ../parisc/index
> +   ../loongarch/index
>   
>   TODOList:
>   
> diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
> index 7c3216845b71..299704c0818d 100644
> --- a/Documentation/translations/zh_CN/index.rst
> +++ b/Documentation/translations/zh_CN/index.rst
> @@ -120,7 +120,7 @@ TODOList:
>   .. toctree::
>      :maxdepth: 2
>   
> -   arch
> +   arch/index
>   
>   其他文档
>   --------

[PATCH 2/6] docs: move xtensa documentation under Documentation/arch/

[Jonathan Corbet]

Architecture-specific documentation is being moved into Documentation/arch/
as a way of cleaning up the top-level documentation directory and making
the docs hierarchy more closely match the source hierarchy.  Move
Documentation/xtensa into arch/ and fix all in-tree references.

Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
 Documentation/arch/index.rst                 | 2 +-
 Documentation/{ => arch}/xtensa/atomctl.rst  | 0
 Documentation/{ => arch}/xtensa/booting.rst  | 0
 Documentation/{ => arch}/xtensa/features.rst | 0
 Documentation/{ => arch}/xtensa/index.rst    | 0
 Documentation/{ => arch}/xtensa/mmu.rst      | 0
 arch/xtensa/include/asm/initialize_mmu.h     | 2 +-
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename Documentation/{ => arch}/xtensa/atomctl.rst (100%)
 rename Documentation/{ => arch}/xtensa/booting.rst (100%)
 rename Documentation/{ => arch}/xtensa/features.rst (100%)
 rename Documentation/{ => arch}/xtensa/index.rst (100%)
 rename Documentation/{ => arch}/xtensa/mmu.rst (100%)

diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index 64a5de81c425..208a8e67599c 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -25,4 +25,4 @@ implementation.
    ../sh/index
    ../sparc/index
    x86/index
-   ../xtensa/index
+   xtensa/index
diff --git a/Documentation/xtensa/atomctl.rst b/Documentation/arch/xtensa/atomctl.rst
similarity index 100%
rename from Documentation/xtensa/atomctl.rst
rename to Documentation/arch/xtensa/atomctl.rst
diff --git a/Documentation/xtensa/booting.rst b/Documentation/arch/xtensa/booting.rst
similarity index 100%
rename from Documentation/xtensa/booting.rst
rename to Documentation/arch/xtensa/booting.rst
diff --git a/Documentation/xtensa/features.rst b/Documentation/arch/xtensa/features.rst
similarity index 100%
rename from Documentation/xtensa/features.rst
rename to Documentation/arch/xtensa/features.rst
diff --git a/Documentation/xtensa/index.rst b/Documentation/arch/xtensa/index.rst
similarity index 100%
rename from Documentation/xtensa/index.rst
rename to Documentation/arch/xtensa/index.rst
diff --git a/Documentation/xtensa/mmu.rst b/Documentation/arch/xtensa/mmu.rst
similarity index 100%
rename from Documentation/xtensa/mmu.rst
rename to Documentation/arch/xtensa/mmu.rst
diff --git a/arch/xtensa/include/asm/initialize_mmu.h b/arch/xtensa/include/asm/initialize_mmu.h
index 9793b49fc641..574795a20d6f 100644
--- a/arch/xtensa/include/asm/initialize_mmu.h
+++ b/arch/xtensa/include/asm/initialize_mmu.h
@@ -43,7 +43,7 @@
 #if XCHAL_HAVE_S32C1I && (XCHAL_HW_MIN_VERSION >= XTENSA_HWVERSION_RC_2009_0)
 /*
  * We Have Atomic Operation Control (ATOMCTL) Register; Initialize it.
- * For details see Documentation/xtensa/atomctl.rst
+ * For details see Documentation/arch/xtensa/atomctl.rst
  */
 #if XCHAL_DCACHE_IS_COHERENT
 	movi	a3, 0x25	/* For SMP/MX -- internal for writeback,
-- 
2.39.2

Re: [PATCH 2/6] docs: move xtensa documentation under Documentation/arch/

[Max Filippov]

On Thu, Mar 23, 2023 at 3:20 PM Jonathan Corbet <corbet@lwn.net> wrote:
>
> Architecture-specific documentation is being moved into Documentation/arch/
> as a way of cleaning up the top-level documentation directory and making
> the docs hierarchy more closely match the source hierarchy.  Move
> Documentation/xtensa into arch/ and fix all in-tree references.
>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
> ---
>  Documentation/arch/index.rst                 | 2 +-
>  Documentation/{ => arch}/xtensa/atomctl.rst  | 0
>  Documentation/{ => arch}/xtensa/booting.rst  | 0
>  Documentation/{ => arch}/xtensa/features.rst | 0
>  Documentation/{ => arch}/xtensa/index.rst    | 0
>  Documentation/{ => arch}/xtensa/mmu.rst      | 0
>  arch/xtensa/include/asm/initialize_mmu.h     | 2 +-
>  7 files changed, 2 insertions(+), 2 deletions(-)
>  rename Documentation/{ => arch}/xtensa/atomctl.rst (100%)
>  rename Documentation/{ => arch}/xtensa/booting.rst (100%)
>  rename Documentation/{ => arch}/xtensa/features.rst (100%)
>  rename Documentation/{ => arch}/xtensa/index.rst (100%)
>  rename Documentation/{ => arch}/xtensa/mmu.rst (100%)

Reviewed-by: Max Filippov <jcmvbkbc@gmail.com>

-- 
Thanks.
-- Max

[PATCH 3/6] docs: move sparc documentation under Documentation/arch/

[Jonathan Corbet]

Architecture-specific documentation is being moved into Documentation/arch/
as a way of cleaning up the top-level documentation directory and making
the docs hierarchy more closely match the source hierarchy.  Move
Documentation/sparc into arch/ and fix all in-tree references.

Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
 Documentation/arch/index.rst                         | 2 +-
 Documentation/{ => arch}/sparc/adi.rst               | 0
 Documentation/{ => arch}/sparc/console.rst           | 0
 Documentation/{ => arch}/sparc/features.rst          | 0
 Documentation/{ => arch}/sparc/index.rst             | 0
 Documentation/{ => arch}/sparc/oradax/dax-hv-api.txt | 0
 Documentation/{ => arch}/sparc/oradax/oracle-dax.rst | 0
 drivers/sbus/char/oradax.c                           | 2 +-
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename Documentation/{ => arch}/sparc/adi.rst (100%)
 rename Documentation/{ => arch}/sparc/console.rst (100%)
 rename Documentation/{ => arch}/sparc/features.rst (100%)
 rename Documentation/{ => arch}/sparc/index.rst (100%)
 rename Documentation/{ => arch}/sparc/oradax/dax-hv-api.txt (100%)
 rename Documentation/{ => arch}/sparc/oradax/oracle-dax.rst (100%)

diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index 208a8e67599c..8ec614488bd2 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -23,6 +23,6 @@ implementation.
    ../riscv/index
    ../s390/index
    ../sh/index
-   ../sparc/index
+   sparc/index
    x86/index
    xtensa/index
diff --git a/Documentation/sparc/adi.rst b/Documentation/arch/sparc/adi.rst
similarity index 100%
rename from Documentation/sparc/adi.rst
rename to Documentation/arch/sparc/adi.rst
diff --git a/Documentation/sparc/console.rst b/Documentation/arch/sparc/console.rst
similarity index 100%
rename from Documentation/sparc/console.rst
rename to Documentation/arch/sparc/console.rst
diff --git a/Documentation/sparc/features.rst b/Documentation/arch/sparc/features.rst
similarity index 100%
rename from Documentation/sparc/features.rst
rename to Documentation/arch/sparc/features.rst
diff --git a/Documentation/sparc/index.rst b/Documentation/arch/sparc/index.rst
similarity index 100%
rename from Documentation/sparc/index.rst
rename to Documentation/arch/sparc/index.rst
diff --git a/Documentation/sparc/oradax/dax-hv-api.txt b/Documentation/arch/sparc/oradax/dax-hv-api.txt
similarity index 100%
rename from Documentation/sparc/oradax/dax-hv-api.txt
rename to Documentation/arch/sparc/oradax/dax-hv-api.txt
diff --git a/Documentation/sparc/oradax/oracle-dax.rst b/Documentation/arch/sparc/oradax/oracle-dax.rst
similarity index 100%
rename from Documentation/sparc/oradax/oracle-dax.rst
rename to Documentation/arch/sparc/oradax/oracle-dax.rst
diff --git a/drivers/sbus/char/oradax.c b/drivers/sbus/char/oradax.c
index e300cf26bc2a..d698ca506cca 100644
--- a/drivers/sbus/char/oradax.c
+++ b/drivers/sbus/char/oradax.c
@@ -18,7 +18,7 @@
  * the recommended way for applications to use the coprocessor, and
  * the driver interface is not intended for general use.
  *
- * See Documentation/sparc/oradax/oracle-dax.rst for more details.
+ * See Documentation/arch/sparc/oradax/oracle-dax.rst for more details.
  */
 
 #include <linux/uaccess.h>
-- 
2.39.2

[PATCH 4/6] docs: move superh documentation under Documentation/arch/

[Jonathan Corbet]

Architecture-specific documentation is being moved into Documentation/arch/
as a way of cleaning up the top-level documentation directory and making
the docs hierarchy more closely match the source hierarchy.  Move
Documentation/sh into arch/ and fix all in-tree references.

Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
 Documentation/arch/index.rst                   | 2 +-
 Documentation/{ => arch}/sh/booting.rst        | 0
 Documentation/{ => arch}/sh/features.rst       | 0
 Documentation/{ => arch}/sh/index.rst          | 0
 Documentation/{ => arch}/sh/new-machine.rst    | 0
 Documentation/{ => arch}/sh/register-banks.rst | 0
 MAINTAINERS                                    | 2 +-
 arch/sh/Kconfig.cpu                            | 2 +-
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename Documentation/{ => arch}/sh/booting.rst (100%)
 rename Documentation/{ => arch}/sh/features.rst (100%)
 rename Documentation/{ => arch}/sh/index.rst (100%)
 rename Documentation/{ => arch}/sh/new-machine.rst (100%)
 rename Documentation/{ => arch}/sh/register-banks.rst (100%)

diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index 8ec614488bd2..792f58e30f25 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -22,7 +22,7 @@ implementation.
    ../powerpc/index
    ../riscv/index
    ../s390/index
-   ../sh/index
+   sh/index
    sparc/index
    x86/index
    xtensa/index
diff --git a/Documentation/sh/booting.rst b/Documentation/arch/sh/booting.rst
similarity index 100%
rename from Documentation/sh/booting.rst
rename to Documentation/arch/sh/booting.rst
diff --git a/Documentation/sh/features.rst b/Documentation/arch/sh/features.rst
similarity index 100%
rename from Documentation/sh/features.rst
rename to Documentation/arch/sh/features.rst
diff --git a/Documentation/sh/index.rst b/Documentation/arch/sh/index.rst
similarity index 100%
rename from Documentation/sh/index.rst
rename to Documentation/arch/sh/index.rst
diff --git a/Documentation/sh/new-machine.rst b/Documentation/arch/sh/new-machine.rst
similarity index 100%
rename from Documentation/sh/new-machine.rst
rename to Documentation/arch/sh/new-machine.rst
diff --git a/Documentation/sh/register-banks.rst b/Documentation/arch/sh/register-banks.rst
similarity index 100%
rename from Documentation/sh/register-banks.rst
rename to Documentation/arch/sh/register-banks.rst
diff --git a/MAINTAINERS b/MAINTAINERS
index 250df8cee463..cf4eb913ea12 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20125,7 +20125,7 @@ M:	John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
 L:	linux-sh@vger.kernel.org
 S:	Maintained
 Q:	http://patchwork.kernel.org/project/linux-sh/list/
-F:	Documentation/sh/
+F:	Documentation/arch/sh/
 F:	arch/sh/
 F:	drivers/sh/
 
diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu
index fff419f3d757..336c54369636 100644
--- a/arch/sh/Kconfig.cpu
+++ b/arch/sh/Kconfig.cpu
@@ -85,7 +85,7 @@ config CPU_HAS_SR_RB
 	  that are lacking this bit must have another method in place for
 	  accomplishing what is taken care of by the banked registers.
 
-	  See <file:Documentation/sh/register-banks.rst> for further
+	  See <file:Documentation/arch/sh/register-banks.rst> for further
 	  information on SR.RB and register banking in the kernel in general.
 
 config CPU_HAS_PTEAEX
-- 
2.39.2

[PATCH 5/6] docs: move openrisc documentation under Documentation/arch/

[Jonathan Corbet]

Architecture-specific documentation is being moved into Documentation/arch/
as a way of cleaning up the top-level documentation directory and making
the docs hierarchy more closely match the source hierarchy.  Move
Documentation/openrisc into arch/ and fix all in-tree references.

Cc: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Alex Shi <alexs@kernel.org>
Cc: Yanteng Si <siyanteng@loongson.cn>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
 Documentation/arch/index.rst                                  | 2 +-
 Documentation/{ => arch}/openrisc/features.rst                | 0
 Documentation/{ => arch}/openrisc/index.rst                   | 0
 Documentation/{ => arch}/openrisc/openrisc_port.rst           | 0
 Documentation/{ => arch}/openrisc/todo.rst                    | 0
 Documentation/translations/zh_CN/arch/index.rst               | 2 +-
 .../translations/zh_CN/{ => arch}/openrisc/index.rst          | 4 ++--
 .../translations/zh_CN/{ => arch}/openrisc/openrisc_port.rst  | 4 ++--
 Documentation/translations/zh_CN/{ => arch}/openrisc/todo.rst | 4 ++--
 MAINTAINERS                                                   | 2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename Documentation/{ => arch}/openrisc/features.rst (100%)
 rename Documentation/{ => arch}/openrisc/index.rst (100%)
 rename Documentation/{ => arch}/openrisc/openrisc_port.rst (100%)
 rename Documentation/{ => arch}/openrisc/todo.rst (100%)
 rename Documentation/translations/zh_CN/{ => arch}/openrisc/index.rst (79%)
 rename Documentation/translations/zh_CN/{ => arch}/openrisc/openrisc_port.rst (97%)
 rename Documentation/translations/zh_CN/{ => arch}/openrisc/todo.rst (88%)

diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index 792f58e30f25..65945daa40fe 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -17,7 +17,7 @@ implementation.
    ../m68k/index
    ../mips/index
    ../nios2/index
-   ../openrisc/index
+   openrisc/index
    ../parisc/index
    ../powerpc/index
    ../riscv/index
diff --git a/Documentation/openrisc/features.rst b/Documentation/arch/openrisc/features.rst
similarity index 100%
rename from Documentation/openrisc/features.rst
rename to Documentation/arch/openrisc/features.rst
diff --git a/Documentation/openrisc/index.rst b/Documentation/arch/openrisc/index.rst
similarity index 100%
rename from Documentation/openrisc/index.rst
rename to Documentation/arch/openrisc/index.rst
diff --git a/Documentation/openrisc/openrisc_port.rst b/Documentation/arch/openrisc/openrisc_port.rst
similarity index 100%
rename from Documentation/openrisc/openrisc_port.rst
rename to Documentation/arch/openrisc/openrisc_port.rst
diff --git a/Documentation/openrisc/todo.rst b/Documentation/arch/openrisc/todo.rst
similarity index 100%
rename from Documentation/openrisc/todo.rst
rename to Documentation/arch/openrisc/todo.rst
diff --git a/Documentation/translations/zh_CN/arch/index.rst b/Documentation/translations/zh_CN/arch/index.rst
index aa53dcff268e..7e59af567331 100644
--- a/Documentation/translations/zh_CN/arch/index.rst
+++ b/Documentation/translations/zh_CN/arch/index.rst
@@ -11,7 +11,7 @@
    ../mips/index
    ../arm64/index
    ../riscv/index
-   ../openrisc/index
+   openrisc/index
    ../parisc/index
    ../loongarch/index
 
diff --git a/Documentation/translations/zh_CN/openrisc/index.rst b/Documentation/translations/zh_CN/arch/openrisc/index.rst
similarity index 79%
rename from Documentation/translations/zh_CN/openrisc/index.rst
rename to Documentation/translations/zh_CN/arch/openrisc/index.rst
index 9ad6cc600884..da21f8ab894b 100644
--- a/Documentation/translations/zh_CN/openrisc/index.rst
+++ b/Documentation/translations/zh_CN/arch/openrisc/index.rst
@@ -1,8 +1,8 @@
 .. SPDX-License-Identifier: GPL-2.0
 
-.. include:: ../disclaimer-zh_CN.rst
+.. include:: ../../disclaimer-zh_CN.rst
 
-:Original: Documentation/openrisc/index.rst
+:Original: Documentation/arch/openrisc/index.rst
 
 :翻译:
 
diff --git a/Documentation/translations/zh_CN/openrisc/openrisc_port.rst b/Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
similarity index 97%
rename from Documentation/translations/zh_CN/openrisc/openrisc_port.rst
rename to Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
index b8a67670492d..cadc580fa23b 100644
--- a/Documentation/translations/zh_CN/openrisc/openrisc_port.rst
+++ b/Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
@@ -1,6 +1,6 @@
-.. include:: ../disclaimer-zh_CN.rst
+.. include:: ../../disclaimer-zh_CN.rst
 
-:Original: Documentation/openrisc/openrisc_port.rst
+:Original: Documentation/arch/openrisc/openrisc_port.rst
 
 :翻译:
 
diff --git a/Documentation/translations/zh_CN/openrisc/todo.rst b/Documentation/translations/zh_CN/arch/openrisc/todo.rst
similarity index 88%
rename from Documentation/translations/zh_CN/openrisc/todo.rst
rename to Documentation/translations/zh_CN/arch/openrisc/todo.rst
index 63c38717edb1..1f6f95616633 100644
--- a/Documentation/translations/zh_CN/openrisc/todo.rst
+++ b/Documentation/translations/zh_CN/arch/openrisc/todo.rst
@@ -1,6 +1,6 @@
-.. include:: ../disclaimer-zh_CN.rst
+.. include:: ../../disclaimer-zh_CN.rst
 
-:Original: Documentation/openrisc/todo.rst
+:Original: Documentation/arch/openrisc/todo.rst
 
 :翻译:
 
diff --git a/MAINTAINERS b/MAINTAINERS
index cf4eb913ea12..64ea94536f4c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15638,7 +15638,7 @@ S:	Maintained
 W:	http://openrisc.io
 T:	git https://github.com/openrisc/linux.git
 F:	Documentation/devicetree/bindings/openrisc/
-F:	Documentation/openrisc/
+F:	Documentation/arch/openrisc/
 F:	arch/openrisc/
 F:	drivers/irqchip/irq-ompic.c
 F:	drivers/irqchip/irq-or1k-*
-- 
2.39.2

Re: [PATCH 5/6] docs: move openrisc documentation under Documentation/arch/

[Yanteng Si]

在 3/24/23 06:19, Jonathan Corbet 写道:
> Architecture-specific documentation is being moved into Documentation/arch/
> as a way of cleaning up the top-level documentation directory and making
> the docs hierarchy more closely match the source hierarchy.  Move
> Documentation/openrisc into arch/ and fix all in-tree references.
>
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
> Cc: Stafford Horne <shorne@gmail.com>
> Cc: Alex Shi <alexs@kernel.org>
> Cc: Yanteng Si <siyanteng@loongson.cn>
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>

Reviewed-by: Yanteng Si <siyanteng@loongson.cn>


Thanks,

Yanteng

> ---
>   Documentation/arch/index.rst                                  | 2 +-
>   Documentation/{ => arch}/openrisc/features.rst                | 0
>   Documentation/{ => arch}/openrisc/index.rst                   | 0
>   Documentation/{ => arch}/openrisc/openrisc_port.rst           | 0
>   Documentation/{ => arch}/openrisc/todo.rst                    | 0
>   Documentation/translations/zh_CN/arch/index.rst               | 2 +-
>   .../translations/zh_CN/{ => arch}/openrisc/index.rst          | 4 ++--
>   .../translations/zh_CN/{ => arch}/openrisc/openrisc_port.rst  | 4 ++--
>   Documentation/translations/zh_CN/{ => arch}/openrisc/todo.rst | 4 ++--
>   MAINTAINERS                                                   | 2 +-
>   10 files changed, 9 insertions(+), 9 deletions(-)
>   rename Documentation/{ => arch}/openrisc/features.rst (100%)
>   rename Documentation/{ => arch}/openrisc/index.rst (100%)
>   rename Documentation/{ => arch}/openrisc/openrisc_port.rst (100%)
>   rename Documentation/{ => arch}/openrisc/todo.rst (100%)
>   rename Documentation/translations/zh_CN/{ => arch}/openrisc/index.rst (79%)
>   rename Documentation/translations/zh_CN/{ => arch}/openrisc/openrisc_port.rst (97%)
>   rename Documentation/translations/zh_CN/{ => arch}/openrisc/todo.rst (88%)
>
> diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
> index 792f58e30f25..65945daa40fe 100644
> --- a/Documentation/arch/index.rst
> +++ b/Documentation/arch/index.rst
> @@ -17,7 +17,7 @@ implementation.
>      ../m68k/index
>      ../mips/index
>      ../nios2/index
> -   ../openrisc/index
> +   openrisc/index
>      ../parisc/index
>      ../powerpc/index
>      ../riscv/index
> diff --git a/Documentation/openrisc/features.rst b/Documentation/arch/openrisc/features.rst
> similarity index 100%
> rename from Documentation/openrisc/features.rst
> rename to Documentation/arch/openrisc/features.rst
> diff --git a/Documentation/openrisc/index.rst b/Documentation/arch/openrisc/index.rst
> similarity index 100%
> rename from Documentation/openrisc/index.rst
> rename to Documentation/arch/openrisc/index.rst
> diff --git a/Documentation/openrisc/openrisc_port.rst b/Documentation/arch/openrisc/openrisc_port.rst
> similarity index 100%
> rename from Documentation/openrisc/openrisc_port.rst
> rename to Documentation/arch/openrisc/openrisc_port.rst
> diff --git a/Documentation/openrisc/todo.rst b/Documentation/arch/openrisc/todo.rst
> similarity index 100%
> rename from Documentation/openrisc/todo.rst
> rename to Documentation/arch/openrisc/todo.rst
> diff --git a/Documentation/translations/zh_CN/arch/index.rst b/Documentation/translations/zh_CN/arch/index.rst
> index aa53dcff268e..7e59af567331 100644
> --- a/Documentation/translations/zh_CN/arch/index.rst
> +++ b/Documentation/translations/zh_CN/arch/index.rst
> @@ -11,7 +11,7 @@
>      ../mips/index
>      ../arm64/index
>      ../riscv/index
> -   ../openrisc/index
> +   openrisc/index
>      ../parisc/index
>      ../loongarch/index
>   
> diff --git a/Documentation/translations/zh_CN/openrisc/index.rst b/Documentation/translations/zh_CN/arch/openrisc/index.rst
> similarity index 79%
> rename from Documentation/translations/zh_CN/openrisc/index.rst
> rename to Documentation/translations/zh_CN/arch/openrisc/index.rst
> index 9ad6cc600884..da21f8ab894b 100644
> --- a/Documentation/translations/zh_CN/openrisc/index.rst
> +++ b/Documentation/translations/zh_CN/arch/openrisc/index.rst
> @@ -1,8 +1,8 @@
>   .. SPDX-License-Identifier: GPL-2.0
>   
> -.. include:: ../disclaimer-zh_CN.rst
> +.. include:: ../../disclaimer-zh_CN.rst
>   
> -:Original: Documentation/openrisc/index.rst
> +:Original: Documentation/arch/openrisc/index.rst
>   
>   :翻译:
>   
> diff --git a/Documentation/translations/zh_CN/openrisc/openrisc_port.rst b/Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
> similarity index 97%
> rename from Documentation/translations/zh_CN/openrisc/openrisc_port.rst
> rename to Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
> index b8a67670492d..cadc580fa23b 100644
> --- a/Documentation/translations/zh_CN/openrisc/openrisc_port.rst
> +++ b/Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
> @@ -1,6 +1,6 @@
> -.. include:: ../disclaimer-zh_CN.rst
> +.. include:: ../../disclaimer-zh_CN.rst
>   
> -:Original: Documentation/openrisc/openrisc_port.rst
> +:Original: Documentation/arch/openrisc/openrisc_port.rst
>   
>   :翻译:
>   
> diff --git a/Documentation/translations/zh_CN/openrisc/todo.rst b/Documentation/translations/zh_CN/arch/openrisc/todo.rst
> similarity index 88%
> rename from Documentation/translations/zh_CN/openrisc/todo.rst
> rename to Documentation/translations/zh_CN/arch/openrisc/todo.rst
> index 63c38717edb1..1f6f95616633 100644
> --- a/Documentation/translations/zh_CN/openrisc/todo.rst
> +++ b/Documentation/translations/zh_CN/arch/openrisc/todo.rst
> @@ -1,6 +1,6 @@
> -.. include:: ../disclaimer-zh_CN.rst
> +.. include:: ../../disclaimer-zh_CN.rst
>   
> -:Original: Documentation/openrisc/todo.rst
> +:Original: Documentation/arch/openrisc/todo.rst
>   
>   :翻译:
>   
> diff --git a/MAINTAINERS b/MAINTAINERS
> index cf4eb913ea12..64ea94536f4c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -15638,7 +15638,7 @@ S:	Maintained
>   W:	http://openrisc.io
>   T:	git https://github.com/openrisc/linux.git
>   F:	Documentation/devicetree/bindings/openrisc/
> -F:	Documentation/openrisc/
> +F:	Documentation/arch/openrisc/
>   F:	arch/openrisc/
>   F:	drivers/irqchip/irq-ompic.c
>   F:	drivers/irqchip/irq-or1k-*

Re: [PATCH 5/6] docs: move openrisc documentation under Documentation/arch/

[Alex Shi]

On Fri, Mar 24, 2023 at 9:43 AM Yanteng Si <siyanteng@loongson.cn> wrote:
>
>
> 在 3/24/23 06:19, Jonathan Corbet 写道:
> > Architecture-specific documentation is being moved into Documentation/arch/
> > as a way of cleaning up the top-level documentation directory and making
> > the docs hierarchy more closely match the source hierarchy.  Move
> > Documentation/openrisc into arch/ and fix all in-tree references.
> >
> > Cc: Jonas Bonn <jonas@southpole.se>
> > Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
> > Cc: Stafford Horne <shorne@gmail.com>
> > Cc: Alex Shi <alexs@kernel.org>
> > Cc: Yanteng Si <siyanteng@loongson.cn>
> > Signed-off-by: Jonathan Corbet <corbet@lwn.net>
>
> Reviewed-by: Yanteng Si <siyanteng@loongson.cn>

Thanks for taking care!

Acked-by: Alex Shi <alexs@kernel.org>

>
>
> Thanks,
>
> Yanteng
>
> > ---
> >   Documentation/arch/index.rst                                  | 2 +-
> >   Documentation/{ => arch}/openrisc/features.rst                | 0
> >   Documentation/{ => arch}/openrisc/index.rst                   | 0
> >   Documentation/{ => arch}/openrisc/openrisc_port.rst           | 0
> >   Documentation/{ => arch}/openrisc/todo.rst                    | 0
> >   Documentation/translations/zh_CN/arch/index.rst               | 2 +-
> >   .../translations/zh_CN/{ => arch}/openrisc/index.rst          | 4 ++--
> >   .../translations/zh_CN/{ => arch}/openrisc/openrisc_port.rst  | 4 ++--
> >   Documentation/translations/zh_CN/{ => arch}/openrisc/todo.rst | 4 ++--
> >   MAINTAINERS                                                   | 2 +-
> >   10 files changed, 9 insertions(+), 9 deletions(-)
> >   rename Documentation/{ => arch}/openrisc/features.rst (100%)
> >   rename Documentation/{ => arch}/openrisc/index.rst (100%)
> >   rename Documentation/{ => arch}/openrisc/openrisc_port.rst (100%)
> >   rename Documentation/{ => arch}/openrisc/todo.rst (100%)
> >   rename Documentation/translations/zh_CN/{ => arch}/openrisc/index.rst (79%)
> >   rename Documentation/translations/zh_CN/{ => arch}/openrisc/openrisc_port.rst (97%)
> >   rename Documentation/translations/zh_CN/{ => arch}/openrisc/todo.rst (88%)
> >
> > diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
> > index 792f58e30f25..65945daa40fe 100644
> > --- a/Documentation/arch/index.rst
> > +++ b/Documentation/arch/index.rst
> > @@ -17,7 +17,7 @@ implementation.
> >      ../m68k/index
> >      ../mips/index
> >      ../nios2/index
> > -   ../openrisc/index
> > +   openrisc/index
> >      ../parisc/index
> >      ../powerpc/index
> >      ../riscv/index
> > diff --git a/Documentation/openrisc/features.rst b/Documentation/arch/openrisc/features.rst
> > similarity index 100%
> > rename from Documentation/openrisc/features.rst
> > rename to Documentation/arch/openrisc/features.rst
> > diff --git a/Documentation/openrisc/index.rst b/Documentation/arch/openrisc/index.rst
> > similarity index 100%
> > rename from Documentation/openrisc/index.rst
> > rename to Documentation/arch/openrisc/index.rst
> > diff --git a/Documentation/openrisc/openrisc_port.rst b/Documentation/arch/openrisc/openrisc_port.rst
> > similarity index 100%
> > rename from Documentation/openrisc/openrisc_port.rst
> > rename to Documentation/arch/openrisc/openrisc_port.rst
> > diff --git a/Documentation/openrisc/todo.rst b/Documentation/arch/openrisc/todo.rst
> > similarity index 100%
> > rename from Documentation/openrisc/todo.rst
> > rename to Documentation/arch/openrisc/todo.rst
> > diff --git a/Documentation/translations/zh_CN/arch/index.rst b/Documentation/translations/zh_CN/arch/index.rst
> > index aa53dcff268e..7e59af567331 100644
> > --- a/Documentation/translations/zh_CN/arch/index.rst
> > +++ b/Documentation/translations/zh_CN/arch/index.rst
> > @@ -11,7 +11,7 @@
> >      ../mips/index
> >      ../arm64/index
> >      ../riscv/index
> > -   ../openrisc/index
> > +   openrisc/index
> >      ../parisc/index
> >      ../loongarch/index
> >
> > diff --git a/Documentation/translations/zh_CN/openrisc/index.rst b/Documentation/translations/zh_CN/arch/openrisc/index.rst
> > similarity index 79%
> > rename from Documentation/translations/zh_CN/openrisc/index.rst
> > rename to Documentation/translations/zh_CN/arch/openrisc/index.rst
> > index 9ad6cc600884..da21f8ab894b 100644
> > --- a/Documentation/translations/zh_CN/openrisc/index.rst
> > +++ b/Documentation/translations/zh_CN/arch/openrisc/index.rst
> > @@ -1,8 +1,8 @@
> >   .. SPDX-License-Identifier: GPL-2.0
> >
> > -.. include:: ../disclaimer-zh_CN.rst
> > +.. include:: ../../disclaimer-zh_CN.rst
> >
> > -:Original: Documentation/openrisc/index.rst
> > +:Original: Documentation/arch/openrisc/index.rst
> >
> >   :翻译:
> >
> > diff --git a/Documentation/translations/zh_CN/openrisc/openrisc_port.rst b/Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
> > similarity index 97%
> > rename from Documentation/translations/zh_CN/openrisc/openrisc_port.rst
> > rename to Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
> > index b8a67670492d..cadc580fa23b 100644
> > --- a/Documentation/translations/zh_CN/openrisc/openrisc_port.rst
> > +++ b/Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
> > @@ -1,6 +1,6 @@
> > -.. include:: ../disclaimer-zh_CN.rst
> > +.. include:: ../../disclaimer-zh_CN.rst
> >
> > -:Original: Documentation/openrisc/openrisc_port.rst
> > +:Original: Documentation/arch/openrisc/openrisc_port.rst
> >
> >   :翻译:
> >
> > diff --git a/Documentation/translations/zh_CN/openrisc/todo.rst b/Documentation/translations/zh_CN/arch/openrisc/todo.rst
> > similarity index 88%
> > rename from Documentation/translations/zh_CN/openrisc/todo.rst
> > rename to Documentation/translations/zh_CN/arch/openrisc/todo.rst
> > index 63c38717edb1..1f6f95616633 100644
> > --- a/Documentation/translations/zh_CN/openrisc/todo.rst
> > +++ b/Documentation/translations/zh_CN/arch/openrisc/todo.rst
> > @@ -1,6 +1,6 @@
> > -.. include:: ../disclaimer-zh_CN.rst
> > +.. include:: ../../disclaimer-zh_CN.rst
> >
> > -:Original: Documentation/openrisc/todo.rst
> > +:Original: Documentation/arch/openrisc/todo.rst
> >
> >   :翻译:
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index cf4eb913ea12..64ea94536f4c 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -15638,7 +15638,7 @@ S:    Maintained
> >   W:  http://openrisc.io
> >   T:  git https://github.com/openrisc/linux.git
> >   F:  Documentation/devicetree/bindings/openrisc/
> > -F:   Documentation/openrisc/
> > +F:   Documentation/arch/openrisc/
> >   F:  arch/openrisc/
> >   F:  drivers/irqchip/irq-ompic.c
> >   F:  drivers/irqchip/irq-or1k-*
>

Re: [PATCH 5/6] docs: move openrisc documentation under Documentation/arch/

[Stafford Horne]

On Thu, Mar 23, 2023 at 04:19:47PM -0600, Jonathan Corbet wrote:
> Architecture-specific documentation is being moved into Documentation/arch/
> as a way of cleaning up the top-level documentation directory and making
> the docs hierarchy more closely match the source hierarchy.  Move
> Documentation/openrisc into arch/ and fix all in-tree references.
> 
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
> Cc: Stafford Horne <shorne@gmail.com>
> Cc: Alex Shi <alexs@kernel.org>
> Cc: Yanteng Si <siyanteng@loongson.cn>
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
> ---
>  Documentation/arch/index.rst                                  | 2 +-
>  Documentation/{ => arch}/openrisc/features.rst                | 0
>  Documentation/{ => arch}/openrisc/index.rst                   | 0
>  Documentation/{ => arch}/openrisc/openrisc_port.rst           | 0
>  Documentation/{ => arch}/openrisc/todo.rst                    | 0
>  Documentation/translations/zh_CN/arch/index.rst               | 2 +-
>  .../translations/zh_CN/{ => arch}/openrisc/index.rst          | 4 ++--
>  .../translations/zh_CN/{ => arch}/openrisc/openrisc_port.rst  | 4 ++--
>  Documentation/translations/zh_CN/{ => arch}/openrisc/todo.rst | 4 ++--
>  MAINTAINERS                                                   | 2 +-
>  10 files changed, 9 insertions(+), 9 deletions(-)
>  rename Documentation/{ => arch}/openrisc/features.rst (100%)
>  rename Documentation/{ => arch}/openrisc/index.rst (100%)
>  rename Documentation/{ => arch}/openrisc/openrisc_port.rst (100%)
>  rename Documentation/{ => arch}/openrisc/todo.rst (100%)
>  rename Documentation/translations/zh_CN/{ => arch}/openrisc/index.rst (79%)
>  rename Documentation/translations/zh_CN/{ => arch}/openrisc/openrisc_port.rst (97%)
>  rename Documentation/translations/zh_CN/{ => arch}/openrisc/todo.rst (88%)
> 
> diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
> index 792f58e30f25..65945daa40fe 100644
> --- a/Documentation/arch/index.rst
> +++ b/Documentation/arch/index.rst
> @@ -17,7 +17,7 @@ implementation.
>     ../m68k/index
>     ../mips/index
>     ../nios2/index
> -   ../openrisc/index
> +   openrisc/index
>     ../parisc/index
>     ../powerpc/index
>     ../riscv/index
> diff --git a/Documentation/openrisc/features.rst b/Documentation/arch/openrisc/features.rst
> similarity index 100%
> rename from Documentation/openrisc/features.rst
> rename to Documentation/arch/openrisc/features.rst
> diff --git a/Documentation/openrisc/index.rst b/Documentation/arch/openrisc/index.rst
> similarity index 100%
> rename from Documentation/openrisc/index.rst
> rename to Documentation/arch/openrisc/index.rst
> diff --git a/Documentation/openrisc/openrisc_port.rst b/Documentation/arch/openrisc/openrisc_port.rst
> similarity index 100%
> rename from Documentation/openrisc/openrisc_port.rst
> rename to Documentation/arch/openrisc/openrisc_port.rst
> diff --git a/Documentation/openrisc/todo.rst b/Documentation/arch/openrisc/todo.rst
> similarity index 100%
> rename from Documentation/openrisc/todo.rst
> rename to Documentation/arch/openrisc/todo.rst
> diff --git a/Documentation/translations/zh_CN/arch/index.rst b/Documentation/translations/zh_CN/arch/index.rst
> index aa53dcff268e..7e59af567331 100644
> --- a/Documentation/translations/zh_CN/arch/index.rst
> +++ b/Documentation/translations/zh_CN/arch/index.rst
> @@ -11,7 +11,7 @@
>     ../mips/index
>     ../arm64/index
>     ../riscv/index
> -   ../openrisc/index
> +   openrisc/index
>     ../parisc/index
>     ../loongarch/index
>  
> diff --git a/Documentation/translations/zh_CN/openrisc/index.rst b/Documentation/translations/zh_CN/arch/openrisc/index.rst
> similarity index 79%
> rename from Documentation/translations/zh_CN/openrisc/index.rst
> rename to Documentation/translations/zh_CN/arch/openrisc/index.rst
> index 9ad6cc600884..da21f8ab894b 100644
> --- a/Documentation/translations/zh_CN/openrisc/index.rst
> +++ b/Documentation/translations/zh_CN/arch/openrisc/index.rst
> @@ -1,8 +1,8 @@
>  .. SPDX-License-Identifier: GPL-2.0
>  
> -.. include:: ../disclaimer-zh_CN.rst
> +.. include:: ../../disclaimer-zh_CN.rst
>  
> -:Original: Documentation/openrisc/index.rst
> +:Original: Documentation/arch/openrisc/index.rst
>  
>  :翻译:
>  
> diff --git a/Documentation/translations/zh_CN/openrisc/openrisc_port.rst b/Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
> similarity index 97%
> rename from Documentation/translations/zh_CN/openrisc/openrisc_port.rst
> rename to Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
> index b8a67670492d..cadc580fa23b 100644
> --- a/Documentation/translations/zh_CN/openrisc/openrisc_port.rst
> +++ b/Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
> @@ -1,6 +1,6 @@
> -.. include:: ../disclaimer-zh_CN.rst
> +.. include:: ../../disclaimer-zh_CN.rst
>  
> -:Original: Documentation/openrisc/openrisc_port.rst
> +:Original: Documentation/arch/openrisc/openrisc_port.rst
>  
>  :翻译:
>  
> diff --git a/Documentation/translations/zh_CN/openrisc/todo.rst b/Documentation/translations/zh_CN/arch/openrisc/todo.rst
> similarity index 88%
> rename from Documentation/translations/zh_CN/openrisc/todo.rst
> rename to Documentation/translations/zh_CN/arch/openrisc/todo.rst
> index 63c38717edb1..1f6f95616633 100644
> --- a/Documentation/translations/zh_CN/openrisc/todo.rst
> +++ b/Documentation/translations/zh_CN/arch/openrisc/todo.rst
> @@ -1,6 +1,6 @@
> -.. include:: ../disclaimer-zh_CN.rst
> +.. include:: ../../disclaimer-zh_CN.rst
>  
> -:Original: Documentation/openrisc/todo.rst
> +:Original: Documentation/arch/openrisc/todo.rst
>  
>  :翻译:
>  
> diff --git a/MAINTAINERS b/MAINTAINERS
> index cf4eb913ea12..64ea94536f4c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -15638,7 +15638,7 @@ S:	Maintained
>  W:	http://openrisc.io
>  T:	git https://github.com/openrisc/linux.git
>  F:	Documentation/devicetree/bindings/openrisc/
> -F:	Documentation/openrisc/
> +F:	Documentation/arch/openrisc/
>  F:	arch/openrisc/
>  F:	drivers/irqchip/irq-ompic.c
>  F:	drivers/irqchip/irq-or1k-*

This all looks ok to me.

Acked-by: Stafford Horne <shorne@gmail.com>

[PATCH 6/6] docs: move nios2 documentation under Documentation/arch/

[Jonathan Corbet]

Architecture-specific documentation is being moved into Documentation/arch/
as a way of cleaning up the top-level documentation directory and making
the docs hierarchy more closely match the source hierarchy.  Move
Documentation/nios2 into arch/ and fix all in-tree references.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
 Documentation/arch/index.rst                | 2 +-
 Documentation/{ => arch}/nios2/features.rst | 0
 Documentation/{ => arch}/nios2/index.rst    | 0
 Documentation/{ => arch}/nios2/nios2.rst    | 0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename Documentation/{ => arch}/nios2/features.rst (100%)
 rename Documentation/{ => arch}/nios2/index.rst (100%)
 rename Documentation/{ => arch}/nios2/nios2.rst (100%)

diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index 65945daa40fe..ccb4d10fc1b6 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -16,7 +16,7 @@ implementation.
    ../loongarch/index
    ../m68k/index
    ../mips/index
-   ../nios2/index
+   nios2/index
    openrisc/index
    ../parisc/index
    ../powerpc/index
diff --git a/Documentation/nios2/features.rst b/Documentation/arch/nios2/features.rst
similarity index 100%
rename from Documentation/nios2/features.rst
rename to Documentation/arch/nios2/features.rst
diff --git a/Documentation/nios2/index.rst b/Documentation/arch/nios2/index.rst
similarity index 100%
rename from Documentation/nios2/index.rst
rename to Documentation/arch/nios2/index.rst
diff --git a/Documentation/nios2/nios2.rst b/Documentation/arch/nios2/nios2.rst
similarity index 100%
rename from Documentation/nios2/nios2.rst
rename to Documentation/arch/nios2/nios2.rst
-- 
2.39.2