* [PATCH 1/4] docs: Move arc architecture docs under Documentation/arch/
2023-03-30 19:56 [PATCH 0/4] docs: move yet more architecture docs Jonathan Corbet
@ 2023-03-30 19:56 ` Jonathan Corbet
2023-04-02 6:44 ` Vineet Gupta
2023-03-30 19:56 ` [PATCH 2/4] docs: move ia64 " Jonathan Corbet
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Jonathan Corbet @ 2023-03-30 19:56 UTC (permalink / raw)
To: linux-doc; +Cc: linux-kernel, linux-arch, Jonathan Corbet, Vineet Gupta
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/arc into arch/ and fix all in-tree references.
Cc: Vineet Gupta <vgupta@kernel.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
Documentation/{ => arch}/arc/arc.rst | 0
Documentation/{ => arch}/arc/features.rst | 0
Documentation/{ => arch}/arc/index.rst | 0
Documentation/arch/index.rst | 2 +-
MAINTAINERS | 2 +-
5 files changed, 2 insertions(+), 2 deletions(-)
rename Documentation/{ => arch}/arc/arc.rst (100%)
rename Documentation/{ => arch}/arc/features.rst (100%)
rename Documentation/{ => arch}/arc/index.rst (100%)
diff --git a/Documentation/arc/arc.rst b/Documentation/arch/arc/arc.rst
similarity index 100%
rename from Documentation/arc/arc.rst
rename to Documentation/arch/arc/arc.rst
diff --git a/Documentation/arc/features.rst b/Documentation/arch/arc/features.rst
similarity index 100%
rename from Documentation/arc/features.rst
rename to Documentation/arch/arc/features.rst
diff --git a/Documentation/arc/index.rst b/Documentation/arch/arc/index.rst
similarity index 100%
rename from Documentation/arc/index.rst
rename to Documentation/arch/arc/index.rst
diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index ccb4d10fc1b6..2aeff47a0014 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -9,7 +9,7 @@ implementation.
.. toctree::
:maxdepth: 2
- ../arc/index
+ arc/index
../arm/index
../arm64/index
../ia64/index
diff --git a/MAINTAINERS b/MAINTAINERS
index 64ea94536f4c..78ff43f63753 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20185,7 +20185,7 @@ M: Vineet Gupta <vgupta@kernel.org>
L: linux-snps-arc@lists.infradead.org
S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
-F: Documentation/arc/
+F: Documentation/arch/arc
F: Documentation/devicetree/bindings/arc/*
F: Documentation/devicetree/bindings/interrupt-controller/snps,arc*
F: arch/arc/
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 1/4] docs: Move arc architecture docs under Documentation/arch/
2023-03-30 19:56 ` [PATCH 1/4] docs: Move arc architecture docs under Documentation/arch/ Jonathan Corbet
@ 2023-04-02 6:44 ` Vineet Gupta
0 siblings, 0 replies; 10+ messages in thread
From: Vineet Gupta @ 2023-04-02 6:44 UTC (permalink / raw)
To: Jonathan Corbet, linux-doc; +Cc: linux-kernel, linux-arch, Vineet Gupta
On 3/31/23 01:26, 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/arc into arch/ and fix all in-tree references.
>
> Cc: Vineet Gupta<vgupta@kernel.org>
> Signed-off-by: Jonathan Corbet<corbet@lwn.net>
Acked-by: Vineet Gupta <vgupta@kernel.org>
Thx,
-Vineet
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/4] docs: move ia64 architecture docs under Documentation/arch/
2023-03-30 19:56 [PATCH 0/4] docs: move yet more architecture docs Jonathan Corbet
2023-03-30 19:56 ` [PATCH 1/4] docs: Move arc architecture docs under Documentation/arch/ Jonathan Corbet
@ 2023-03-30 19:56 ` Jonathan Corbet
2023-03-30 19:56 ` [PATCH 3/4] docs: move parisc documentation " Jonathan Corbet
2023-03-30 19:56 ` [PATCH 4/4] docs: move m68k architecture " Jonathan Corbet
3 siblings, 0 replies; 10+ messages in thread
From: Jonathan Corbet @ 2023-03-30 19:56 UTC (permalink / raw)
To: linux-doc; +Cc: linux-kernel, linux-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/ia64 into arch/ and fix all in-tree references.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
Documentation/{ => arch}/ia64/aliasing.rst | 0
Documentation/{ => arch}/ia64/efirtc.rst | 0
Documentation/{ => arch}/ia64/err_inject.rst | 0
Documentation/{ => arch}/ia64/features.rst | 0
Documentation/{ => arch}/ia64/fsys.rst | 0
Documentation/{ => arch}/ia64/ia64.rst | 0
Documentation/{ => arch}/ia64/index.rst | 0
Documentation/{ => arch}/ia64/irq-redir.rst | 0
Documentation/{ => arch}/ia64/mca.rst | 0
Documentation/{ => arch}/ia64/serial.rst | 0
Documentation/arch/index.rst | 2 +-
MAINTAINERS | 2 +-
arch/ia64/kernel/efi.c | 2 +-
arch/ia64/kernel/fsys.S | 2 +-
arch/ia64/mm/ioremap.c | 2 +-
arch/ia64/pci/pci.c | 2 +-
16 files changed, 6 insertions(+), 6 deletions(-)
rename Documentation/{ => arch}/ia64/aliasing.rst (100%)
rename Documentation/{ => arch}/ia64/efirtc.rst (100%)
rename Documentation/{ => arch}/ia64/err_inject.rst (100%)
rename Documentation/{ => arch}/ia64/features.rst (100%)
rename Documentation/{ => arch}/ia64/fsys.rst (100%)
rename Documentation/{ => arch}/ia64/ia64.rst (100%)
rename Documentation/{ => arch}/ia64/index.rst (100%)
rename Documentation/{ => arch}/ia64/irq-redir.rst (100%)
rename Documentation/{ => arch}/ia64/mca.rst (100%)
rename Documentation/{ => arch}/ia64/serial.rst (100%)
diff --git a/Documentation/ia64/aliasing.rst b/Documentation/arch/ia64/aliasing.rst
similarity index 100%
rename from Documentation/ia64/aliasing.rst
rename to Documentation/arch/ia64/aliasing.rst
diff --git a/Documentation/ia64/efirtc.rst b/Documentation/arch/ia64/efirtc.rst
similarity index 100%
rename from Documentation/ia64/efirtc.rst
rename to Documentation/arch/ia64/efirtc.rst
diff --git a/Documentation/ia64/err_inject.rst b/Documentation/arch/ia64/err_inject.rst
similarity index 100%
rename from Documentation/ia64/err_inject.rst
rename to Documentation/arch/ia64/err_inject.rst
diff --git a/Documentation/ia64/features.rst b/Documentation/arch/ia64/features.rst
similarity index 100%
rename from Documentation/ia64/features.rst
rename to Documentation/arch/ia64/features.rst
diff --git a/Documentation/ia64/fsys.rst b/Documentation/arch/ia64/fsys.rst
similarity index 100%
rename from Documentation/ia64/fsys.rst
rename to Documentation/arch/ia64/fsys.rst
diff --git a/Documentation/ia64/ia64.rst b/Documentation/arch/ia64/ia64.rst
similarity index 100%
rename from Documentation/ia64/ia64.rst
rename to Documentation/arch/ia64/ia64.rst
diff --git a/Documentation/ia64/index.rst b/Documentation/arch/ia64/index.rst
similarity index 100%
rename from Documentation/ia64/index.rst
rename to Documentation/arch/ia64/index.rst
diff --git a/Documentation/ia64/irq-redir.rst b/Documentation/arch/ia64/irq-redir.rst
similarity index 100%
rename from Documentation/ia64/irq-redir.rst
rename to Documentation/arch/ia64/irq-redir.rst
diff --git a/Documentation/ia64/mca.rst b/Documentation/arch/ia64/mca.rst
similarity index 100%
rename from Documentation/ia64/mca.rst
rename to Documentation/arch/ia64/mca.rst
diff --git a/Documentation/ia64/serial.rst b/Documentation/arch/ia64/serial.rst
similarity index 100%
rename from Documentation/ia64/serial.rst
rename to Documentation/arch/ia64/serial.rst
diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index 2aeff47a0014..77e287c3eeb9 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -12,7 +12,7 @@ implementation.
arc/index
../arm/index
../arm64/index
- ../ia64/index
+ ia64/index
../loongarch/index
../m68k/index
../mips/index
diff --git a/MAINTAINERS b/MAINTAINERS
index 78ff43f63753..c515abc269f2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9724,7 +9724,7 @@ F: include/linux/i3c/
IA64 (Itanium) PLATFORM
L: linux-ia64@vger.kernel.org
S: Orphan
-F: Documentation/ia64/
+F: Documentation/arch/ia64/
F: arch/ia64/
IBM Operation Panel Input Driver
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 21dfa4aa35bb..033f5aead88a 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -853,7 +853,7 @@ valid_phys_addr_range (phys_addr_t phys_addr, unsigned long size)
* /dev/mem reads and writes use copy_to_user(), which implicitly
* uses a granule-sized kernel identity mapping. It's really
* only safe to do this for regions in kern_memmap. For more
- * details, see Documentation/ia64/aliasing.rst.
+ * details, see Documentation/arch/ia64/aliasing.rst.
*/
attr = kern_mem_attribute(phys_addr, size);
if (attr & EFI_MEMORY_WB || attr & EFI_MEMORY_UC)
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index 2094f3249019..cc4733e9990a 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -28,7 +28,7 @@
#include <asm/native/inst.h>
/*
- * See Documentation/ia64/fsys.rst for details on fsyscalls.
+ * See Documentation/arch/ia64/fsys.rst for details on fsyscalls.
*
* On entry to an fsyscall handler:
* r10 = 0 (i.e., defaults to "successful syscall return")
diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c
index 55fd3eb753ff..92b81bc91397 100644
--- a/arch/ia64/mm/ioremap.c
+++ b/arch/ia64/mm/ioremap.c
@@ -43,7 +43,7 @@ ioremap (unsigned long phys_addr, unsigned long size)
/*
* For things in kern_memmap, we must use the same attribute
* as the rest of the kernel. For more details, see
- * Documentation/ia64/aliasing.rst.
+ * Documentation/arch/ia64/aliasing.rst.
*/
attr = kern_mem_attribute(phys_addr, size);
if (attr & EFI_MEMORY_WB)
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 211757e34198..0a0328e61bef 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -448,7 +448,7 @@ pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma,
return -ENOSYS;
/*
- * Avoid attribute aliasing. See Documentation/ia64/aliasing.rst
+ * Avoid attribute aliasing. See Documentation/arch/ia64/aliasing.rst
* for more details.
*/
if (!valid_mmap_phys_addr_range(vma->vm_pgoff, size))
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/4] docs: move parisc documentation under Documentation/arch/
2023-03-30 19:56 [PATCH 0/4] docs: move yet more architecture docs Jonathan Corbet
2023-03-30 19:56 ` [PATCH 1/4] docs: Move arc architecture docs under Documentation/arch/ Jonathan Corbet
2023-03-30 19:56 ` [PATCH 2/4] docs: move ia64 " Jonathan Corbet
@ 2023-03-30 19:56 ` Jonathan Corbet
2023-04-01 6:43 ` Yanteng Si
2023-03-30 19:56 ` [PATCH 4/4] docs: move m68k architecture " Jonathan Corbet
3 siblings, 1 reply; 10+ messages in thread
From: Jonathan Corbet @ 2023-03-30 19:56 UTC (permalink / raw)
To: linux-doc
Cc: linux-kernel, linux-arch, Jonathan Corbet, James E.J. Bottomley,
Helge Deller, Alex Shi, Yanteng Si
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/parisc into arch/ and fix all in-tree references.
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
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}/parisc/debugging.rst | 0
Documentation/{ => arch}/parisc/features.rst | 0
Documentation/{ => arch}/parisc/index.rst | 0
Documentation/{ => arch}/parisc/registers.rst | 0
Documentation/translations/zh_CN/arch/index.rst | 2 +-
.../translations/zh_CN/{ => arch}/parisc/debugging.rst | 2 +-
Documentation/translations/zh_CN/{ => arch}/parisc/index.rst | 2 +-
.../translations/zh_CN/{ => arch}/parisc/registers.rst | 2 +-
MAINTAINERS | 2 +-
10 files changed, 6 insertions(+), 6 deletions(-)
rename Documentation/{ => arch}/parisc/debugging.rst (100%)
rename Documentation/{ => arch}/parisc/features.rst (100%)
rename Documentation/{ => arch}/parisc/index.rst (100%)
rename Documentation/{ => arch}/parisc/registers.rst (100%)
rename Documentation/translations/zh_CN/{ => arch}/parisc/debugging.rst (97%)
rename Documentation/translations/zh_CN/{ => arch}/parisc/index.rst (88%)
rename Documentation/translations/zh_CN/{ => arch}/parisc/registers.rst (99%)
diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index 77e287c3eeb9..6839cd46850d 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -18,7 +18,7 @@ implementation.
../mips/index
nios2/index
openrisc/index
- ../parisc/index
+ parisc/index
../powerpc/index
../riscv/index
../s390/index
diff --git a/Documentation/parisc/debugging.rst b/Documentation/arch/parisc/debugging.rst
similarity index 100%
rename from Documentation/parisc/debugging.rst
rename to Documentation/arch/parisc/debugging.rst
diff --git a/Documentation/parisc/features.rst b/Documentation/arch/parisc/features.rst
similarity index 100%
rename from Documentation/parisc/features.rst
rename to Documentation/arch/parisc/features.rst
diff --git a/Documentation/parisc/index.rst b/Documentation/arch/parisc/index.rst
similarity index 100%
rename from Documentation/parisc/index.rst
rename to Documentation/arch/parisc/index.rst
diff --git a/Documentation/parisc/registers.rst b/Documentation/arch/parisc/registers.rst
similarity index 100%
rename from Documentation/parisc/registers.rst
rename to Documentation/arch/parisc/registers.rst
diff --git a/Documentation/translations/zh_CN/arch/index.rst b/Documentation/translations/zh_CN/arch/index.rst
index 7e59af567331..908ea131bb1c 100644
--- a/Documentation/translations/zh_CN/arch/index.rst
+++ b/Documentation/translations/zh_CN/arch/index.rst
@@ -12,7 +12,7 @@
../arm64/index
../riscv/index
openrisc/index
- ../parisc/index
+ parisc/index
../loongarch/index
TODOList:
diff --git a/Documentation/translations/zh_CN/parisc/debugging.rst b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
similarity index 97%
rename from Documentation/translations/zh_CN/parisc/debugging.rst
rename to Documentation/translations/zh_CN/arch/parisc/debugging.rst
index 68b73eb57105..9bd197eb0d41 100644
--- a/Documentation/translations/zh_CN/parisc/debugging.rst
+++ b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
@@ -1,6 +1,6 @@
.. include:: ../disclaimer-zh_CN.rst
-:Original: Documentation/parisc/debugging.rst
+:Original: Documentation/arch/parisc/debugging.rst
:翻译:
diff --git a/Documentation/translations/zh_CN/parisc/index.rst b/Documentation/translations/zh_CN/arch/parisc/index.rst
similarity index 88%
rename from Documentation/translations/zh_CN/parisc/index.rst
rename to Documentation/translations/zh_CN/arch/parisc/index.rst
index 0cc553fc8272..848742539550 100644
--- a/Documentation/translations/zh_CN/parisc/index.rst
+++ b/Documentation/translations/zh_CN/arch/parisc/index.rst
@@ -1,7 +1,7 @@
.. SPDX-License-Identifier: GPL-2.0
.. include:: ../disclaimer-zh_CN.rst
-:Original: Documentation/parisc/index.rst
+:Original: Documentation/arch/parisc/index.rst
:翻译:
diff --git a/Documentation/translations/zh_CN/parisc/registers.rst b/Documentation/translations/zh_CN/arch/parisc/registers.rst
similarity index 99%
rename from Documentation/translations/zh_CN/parisc/registers.rst
rename to Documentation/translations/zh_CN/arch/parisc/registers.rst
index d2ab1874a602..caf5f258248b 100644
--- a/Documentation/translations/zh_CN/parisc/registers.rst
+++ b/Documentation/translations/zh_CN/arch/parisc/registers.rst
@@ -1,6 +1,6 @@
.. include:: ../disclaimer-zh_CN.rst
-:Original: Documentation/parisc/registers.rst
+:Original: Documentation/arch/parisc/registers.rst
:翻译:
diff --git a/MAINTAINERS b/MAINTAINERS
index c515abc269f2..02720bc91481 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15834,7 +15834,7 @@ W: https://parisc.wiki.kernel.org
Q: http://patchwork.kernel.org/project/linux-parisc/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
-F: Documentation/parisc/
+F: Documentation/arch/parisc/
F: arch/parisc/
F: drivers/char/agp/parisc-agp.c
F: drivers/input/misc/hp_sdc_rtc.c
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 3/4] docs: move parisc documentation under Documentation/arch/
2023-03-30 19:56 ` [PATCH 3/4] docs: move parisc documentation " Jonathan Corbet
@ 2023-04-01 6:43 ` Yanteng Si
0 siblings, 0 replies; 10+ messages in thread
From: Yanteng Si @ 2023-04-01 6:43 UTC (permalink / raw)
To: Jonathan Corbet, linux-doc
Cc: linux-kernel, linux-arch, James E.J. Bottomley, Helge Deller,
Alex Shi
在 3/31/23 03:56, 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/parisc into arch/ and fix all in-tree references.
>
> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
> Cc: Helge Deller <deller@gmx.de>
> 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}/parisc/debugging.rst | 0
> Documentation/{ => arch}/parisc/features.rst | 0
> Documentation/{ => arch}/parisc/index.rst | 0
> Documentation/{ => arch}/parisc/registers.rst | 0
> Documentation/translations/zh_CN/arch/index.rst | 2 +-
> .../translations/zh_CN/{ => arch}/parisc/debugging.rst | 2 +-
> Documentation/translations/zh_CN/{ => arch}/parisc/index.rst | 2 +-
> .../translations/zh_CN/{ => arch}/parisc/registers.rst | 2 +-
> MAINTAINERS | 2 +-
> 10 files changed, 6 insertions(+), 6 deletions(-)
> rename Documentation/{ => arch}/parisc/debugging.rst (100%)
> rename Documentation/{ => arch}/parisc/features.rst (100%)
> rename Documentation/{ => arch}/parisc/index.rst (100%)
> rename Documentation/{ => arch}/parisc/registers.rst (100%)
> rename Documentation/translations/zh_CN/{ => arch}/parisc/debugging.rst (97%)
> rename Documentation/translations/zh_CN/{ => arch}/parisc/index.rst (88%)
> rename Documentation/translations/zh_CN/{ => arch}/parisc/registers.rst (99%)
>
> diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
> index 77e287c3eeb9..6839cd46850d 100644
> --- a/Documentation/arch/index.rst
> +++ b/Documentation/arch/index.rst
> @@ -18,7 +18,7 @@ implementation.
> ../mips/index
> nios2/index
> openrisc/index
> - ../parisc/index
> + parisc/index
> ../powerpc/index
> ../riscv/index
> ../s390/index
> diff --git a/Documentation/parisc/debugging.rst b/Documentation/arch/parisc/debugging.rst
> similarity index 100%
> rename from Documentation/parisc/debugging.rst
> rename to Documentation/arch/parisc/debugging.rst
> diff --git a/Documentation/parisc/features.rst b/Documentation/arch/parisc/features.rst
> similarity index 100%
> rename from Documentation/parisc/features.rst
> rename to Documentation/arch/parisc/features.rst
> diff --git a/Documentation/parisc/index.rst b/Documentation/arch/parisc/index.rst
> similarity index 100%
> rename from Documentation/parisc/index.rst
> rename to Documentation/arch/parisc/index.rst
> diff --git a/Documentation/parisc/registers.rst b/Documentation/arch/parisc/registers.rst
> similarity index 100%
> rename from Documentation/parisc/registers.rst
> rename to Documentation/arch/parisc/registers.rst
> diff --git a/Documentation/translations/zh_CN/arch/index.rst b/Documentation/translations/zh_CN/arch/index.rst
> index 7e59af567331..908ea131bb1c 100644
> --- a/Documentation/translations/zh_CN/arch/index.rst
> +++ b/Documentation/translations/zh_CN/arch/index.rst
> @@ -12,7 +12,7 @@
> ../arm64/index
> ../riscv/index
> openrisc/index
> - ../parisc/index
> + parisc/index
> ../loongarch/index
>
> TODOList:
> diff --git a/Documentation/translations/zh_CN/parisc/debugging.rst b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
> similarity index 97%
> rename from Documentation/translations/zh_CN/parisc/debugging.rst
> rename to Documentation/translations/zh_CN/arch/parisc/debugging.rst
> index 68b73eb57105..9bd197eb0d41 100644
> --- a/Documentation/translations/zh_CN/parisc/debugging.rst
> +++ b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
> @@ -1,6 +1,6 @@
> .. include:: ../disclaimer-zh_CN.rst
>
> -:Original: Documentation/parisc/debugging.rst
> +:Original: Documentation/arch/parisc/debugging.rst
>
> :翻译:
>
> diff --git a/Documentation/translations/zh_CN/parisc/index.rst b/Documentation/translations/zh_CN/arch/parisc/index.rst
> similarity index 88%
> rename from Documentation/translations/zh_CN/parisc/index.rst
> rename to Documentation/translations/zh_CN/arch/parisc/index.rst
> index 0cc553fc8272..848742539550 100644
> --- a/Documentation/translations/zh_CN/parisc/index.rst
> +++ b/Documentation/translations/zh_CN/arch/parisc/index.rst
> @@ -1,7 +1,7 @@
> .. SPDX-License-Identifier: GPL-2.0
> .. include:: ../disclaimer-zh_CN.rst
>
> -:Original: Documentation/parisc/index.rst
> +:Original: Documentation/arch/parisc/index.rst
>
> :翻译:
>
> diff --git a/Documentation/translations/zh_CN/parisc/registers.rst b/Documentation/translations/zh_CN/arch/parisc/registers.rst
> similarity index 99%
> rename from Documentation/translations/zh_CN/parisc/registers.rst
> rename to Documentation/translations/zh_CN/arch/parisc/registers.rst
> index d2ab1874a602..caf5f258248b 100644
> --- a/Documentation/translations/zh_CN/parisc/registers.rst
> +++ b/Documentation/translations/zh_CN/arch/parisc/registers.rst
> @@ -1,6 +1,6 @@
> .. include:: ../disclaimer-zh_CN.rst
>
> -:Original: Documentation/parisc/registers.rst
> +:Original: Documentation/arch/parisc/registers.rst
>
> :翻译:
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index c515abc269f2..02720bc91481 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -15834,7 +15834,7 @@ W: https://parisc.wiki.kernel.org
> Q: http://patchwork.kernel.org/project/linux-parisc/list/
> T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
> T: git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
> -F: Documentation/parisc/
> +F: Documentation/arch/parisc/
> F: arch/parisc/
> F: drivers/char/agp/parisc-agp.c
> F: drivers/input/misc/hp_sdc_rtc.c
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 4/4] docs: move m68k architecture documentation under Documentation/arch/
2023-03-30 19:56 [PATCH 0/4] docs: move yet more architecture docs Jonathan Corbet
` (2 preceding siblings ...)
2023-03-30 19:56 ` [PATCH 3/4] docs: move parisc documentation " Jonathan Corbet
@ 2023-03-30 19:56 ` Jonathan Corbet
2023-03-31 7:44 ` Geert Uytterhoeven
3 siblings, 1 reply; 10+ messages in thread
From: Jonathan Corbet @ 2023-03-30 19:56 UTC (permalink / raw)
To: linux-doc; +Cc: linux-kernel, linux-arch, Jonathan Corbet, Geert Uytterhoeven
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/m68k into arch/ and fix all in-tree references.
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
Documentation/admin-guide/kernel-parameters.rst | 2 +-
Documentation/arch/index.rst | 2 +-
Documentation/{ => arch}/m68k/buddha-driver.rst | 0
Documentation/{ => arch}/m68k/features.rst | 0
Documentation/{ => arch}/m68k/index.rst | 0
Documentation/{ => arch}/m68k/kernel-options.rst | 0
Documentation/translations/zh_CN/arch/parisc/debugging.rst | 2 +-
Documentation/translations/zh_CN/arch/parisc/index.rst | 2 +-
Documentation/translations/zh_CN/arch/parisc/registers.rst | 2 +-
arch/m68k/Kconfig.machine | 4 ++--
10 files changed, 7 insertions(+), 7 deletions(-)
rename Documentation/{ => arch}/m68k/buddha-driver.rst (100%)
rename Documentation/{ => arch}/m68k/features.rst (100%)
rename Documentation/{ => arch}/m68k/index.rst (100%)
rename Documentation/{ => arch}/m68k/kernel-options.rst (100%)
diff --git a/Documentation/admin-guide/kernel-parameters.rst b/Documentation/admin-guide/kernel-parameters.rst
index c833eac3fe59..6385e3b9b879 100644
--- a/Documentation/admin-guide/kernel-parameters.rst
+++ b/Documentation/admin-guide/kernel-parameters.rst
@@ -131,7 +131,7 @@ parameter is applicable::
LOOP Loopback device support is enabled.
M68k M68k architecture is enabled.
These options have more detailed description inside of
- Documentation/m68k/kernel-options.rst.
+ Documentation/arch/m68k/kernel-options.rst.
MDA MDA console support is enabled.
MIPS MIPS architecture is enabled.
MOUSE Appropriate mouse support is enabled.
diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index 6839cd46850d..80ee31016584 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -14,7 +14,7 @@ implementation.
../arm64/index
ia64/index
../loongarch/index
- ../m68k/index
+ m68k/index
../mips/index
nios2/index
openrisc/index
diff --git a/Documentation/m68k/buddha-driver.rst b/Documentation/arch/m68k/buddha-driver.rst
similarity index 100%
rename from Documentation/m68k/buddha-driver.rst
rename to Documentation/arch/m68k/buddha-driver.rst
diff --git a/Documentation/m68k/features.rst b/Documentation/arch/m68k/features.rst
similarity index 100%
rename from Documentation/m68k/features.rst
rename to Documentation/arch/m68k/features.rst
diff --git a/Documentation/m68k/index.rst b/Documentation/arch/m68k/index.rst
similarity index 100%
rename from Documentation/m68k/index.rst
rename to Documentation/arch/m68k/index.rst
diff --git a/Documentation/m68k/kernel-options.rst b/Documentation/arch/m68k/kernel-options.rst
similarity index 100%
rename from Documentation/m68k/kernel-options.rst
rename to Documentation/arch/m68k/kernel-options.rst
diff --git a/Documentation/translations/zh_CN/arch/parisc/debugging.rst b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
index 9bd197eb0d41..c6b9de6d3175 100644
--- a/Documentation/translations/zh_CN/arch/parisc/debugging.rst
+++ b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
@@ -1,4 +1,4 @@
-.. include:: ../disclaimer-zh_CN.rst
+.. include:: ../../disclaimer-zh_CN.rst
:Original: Documentation/arch/parisc/debugging.rst
diff --git a/Documentation/translations/zh_CN/arch/parisc/index.rst b/Documentation/translations/zh_CN/arch/parisc/index.rst
index 848742539550..9f69283bd1c9 100644
--- a/Documentation/translations/zh_CN/arch/parisc/index.rst
+++ b/Documentation/translations/zh_CN/arch/parisc/index.rst
@@ -1,5 +1,5 @@
.. SPDX-License-Identifier: GPL-2.0
-.. include:: ../disclaimer-zh_CN.rst
+.. include:: ../../disclaimer-zh_CN.rst
:Original: Documentation/arch/parisc/index.rst
diff --git a/Documentation/translations/zh_CN/arch/parisc/registers.rst b/Documentation/translations/zh_CN/arch/parisc/registers.rst
index caf5f258248b..a55250afcc27 100644
--- a/Documentation/translations/zh_CN/arch/parisc/registers.rst
+++ b/Documentation/translations/zh_CN/arch/parisc/registers.rst
@@ -1,4 +1,4 @@
-.. include:: ../disclaimer-zh_CN.rst
+.. include:: ../../disclaimer-zh_CN.rst
:Original: Documentation/arch/parisc/registers.rst
diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine
index e2f961208f18..28eebabfd34b 100644
--- a/arch/m68k/Kconfig.machine
+++ b/arch/m68k/Kconfig.machine
@@ -11,7 +11,7 @@ config AMIGA
help
This option enables support for the Amiga series of computers. If
you plan to use this kernel on an Amiga, say Y here and browse the
- material available in <file:Documentation/m68k>; otherwise say N.
+ material available in <file:Documentation/arch/m68k>; otherwise say N.
config ATARI
bool "Atari support"
@@ -23,7 +23,7 @@ config ATARI
This option enables support for the 68000-based Atari series of
computers (including the TT, Falcon and Medusa). If you plan to use
this kernel on an Atari, say Y here and browse the material
- available in <file:Documentation/m68k>; otherwise say N.
+ available in <file:Documentation/arch/m68k>; otherwise say N.
config ATARI_KBD_CORE
bool
--
2.39.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 4/4] docs: move m68k architecture documentation under Documentation/arch/
2023-03-30 19:56 ` [PATCH 4/4] docs: move m68k architecture " Jonathan Corbet
@ 2023-03-31 7:44 ` Geert Uytterhoeven
2023-03-31 13:02 ` Jonathan Corbet
0 siblings, 1 reply; 10+ messages in thread
From: Geert Uytterhoeven @ 2023-03-31 7:44 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: linux-doc, linux-kernel, linux-arch
Hi Jon,
On Thu, Mar 30, 2023 at 9:56 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/m68k into arch/ and fix all in-tree references.
>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Thanks for your patch!
> diff --git a/Documentation/translations/zh_CN/arch/parisc/debugging.rst b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
> index 9bd197eb0d41..c6b9de6d3175 100644
> --- a/Documentation/translations/zh_CN/arch/parisc/debugging.rst
> +++ b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
> @@ -1,4 +1,4 @@
> -.. include:: ../disclaimer-zh_CN.rst
> +.. include:: ../../disclaimer-zh_CN.rst
>
> :Original: Documentation/arch/parisc/debugging.rst
>
> diff --git a/Documentation/translations/zh_CN/arch/parisc/index.rst b/Documentation/translations/zh_CN/arch/parisc/index.rst
> index 848742539550..9f69283bd1c9 100644
> --- a/Documentation/translations/zh_CN/arch/parisc/index.rst
> +++ b/Documentation/translations/zh_CN/arch/parisc/index.rst
> @@ -1,5 +1,5 @@
> .. SPDX-License-Identifier: GPL-2.0
> -.. include:: ../disclaimer-zh_CN.rst
> +.. include:: ../../disclaimer-zh_CN.rst
>
> :Original: Documentation/arch/parisc/index.rst
>
> diff --git a/Documentation/translations/zh_CN/arch/parisc/registers.rst b/Documentation/translations/zh_CN/arch/parisc/registers.rst
> index caf5f258248b..a55250afcc27 100644
> --- a/Documentation/translations/zh_CN/arch/parisc/registers.rst
> +++ b/Documentation/translations/zh_CN/arch/parisc/registers.rst
> @@ -1,4 +1,4 @@
> -.. include:: ../disclaimer-zh_CN.rst
> +.. include:: ../../disclaimer-zh_CN.rst
>
> :Original: Documentation/arch/parisc/registers.rst
>
These changes do not belong in this patch.
The rest LGTM, so with the above fixed:
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 4/4] docs: move m68k architecture documentation under Documentation/arch/
2023-03-31 7:44 ` Geert Uytterhoeven
@ 2023-03-31 13:02 ` Jonathan Corbet
2023-03-31 13:03 ` Jonathan Corbet
0 siblings, 1 reply; 10+ messages in thread
From: Jonathan Corbet @ 2023-03-31 13:02 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: linux-doc, linux-kernel, linux-arch
Geert Uytterhoeven <geert@linux-m68k.org> writes:
>> diff --git a/Documentation/translations/zh_CN/arch/parisc/debugging.rst b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
>> index 9bd197eb0d41..c6b9de6d3175 100644
>> --- a/Documentation/translations/zh_CN/arch/parisc/debugging.rst
>> +++ b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
>> @@ -1,4 +1,4 @@
>> -.. include:: ../disclaimer-zh_CN.rst
>> +.. include:: ../../disclaimer-zh_CN.rst
>>
>> :Original: Documentation/arch/parisc/debugging.rst
>>
>> diff --git a/Documentation/translations/zh_CN/arch/parisc/index.rst b/Documentation/translations/zh_CN/arch/parisc/index.rst
>> index 848742539550..9f69283bd1c9 100644
>> --- a/Documentation/translations/zh_CN/arch/parisc/index.rst
>> +++ b/Documentation/translations/zh_CN/arch/parisc/index.rst
>> @@ -1,5 +1,5 @@
>> .. SPDX-License-Identifier: GPL-2.0
>> -.. include:: ../disclaimer-zh_CN.rst
>> +.. include:: ../../disclaimer-zh_CN.rst
>>
>> :Original: Documentation/arch/parisc/index.rst
>>
>> diff --git a/Documentation/translations/zh_CN/arch/parisc/registers.rst b/Documentation/translations/zh_CN/arch/parisc/registers.rst
>> index caf5f258248b..a55250afcc27 100644
>> --- a/Documentation/translations/zh_CN/arch/parisc/registers.rst
>> +++ b/Documentation/translations/zh_CN/arch/parisc/registers.rst
>> @@ -1,4 +1,4 @@
>> -.. include:: ../disclaimer-zh_CN.rst
>> +.. include:: ../../disclaimer-zh_CN.rst
>>
>> :Original: Documentation/arch/parisc/registers.rst
>>
>
> These changes do not belong in this patch.
Why not? If I don't make those changes when moving the files, the
documentation build will break.
Thanks,
jon
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] docs: move m68k architecture documentation under Documentation/arch/
2023-03-31 13:02 ` Jonathan Corbet
@ 2023-03-31 13:03 ` Jonathan Corbet
0 siblings, 0 replies; 10+ messages in thread
From: Jonathan Corbet @ 2023-03-31 13:03 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: linux-doc, linux-kernel, linux-arch
Jonathan Corbet <corbet@lwn.net> writes:
>>> :Original: Documentation/arch/parisc/registers.rst
>>>
>>
>> These changes do not belong in this patch.
>
> Why not? If I don't make those changes when moving the files, the
> documentation build will break.
Never mind, those should be in the parisc patch. I should know better
than to dig into things while still on the first cup of coffee.
Sorry for the noise,
jon
^ permalink raw reply [flat|nested] 10+ messages in thread