From patchwork Thu Mar 30 19:56:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 77388 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp103745vqo; Thu, 30 Mar 2023 13:05:57 -0700 (PDT) X-Google-Smtp-Source: AKy350aQ00Ub/YqfL+oc1wC/py/Y1NlOHiXDwnZOuABIv51KWDejAnweA6X6YxL4/QuxkWXbiR17 X-Received: by 2002:a05:6402:20b:b0:4fe:ddf:8d8c with SMTP id t11-20020a056402020b00b004fe0ddf8d8cmr22890565edv.13.1680206757199; Thu, 30 Mar 2023 13:05:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680206757; cv=none; d=google.com; s=arc-20160816; b=T4PUVkiQS5gj2JP2uTdWRAf+TriLHjLZ23mt6T0Llee7Pd3pY7l3awubsMywoOXHqI mm72nLciIMO3P/STrci5xDAit/UnqTxIETMxTsdnW5n1m4yGX4bpsoFWeC+V9YffeQv7 Okd4gl9pwMoyyTI+7/oB4Z6/567bTK28F1JNxlZjMxZNeIC16dRNxceXViXxYrOeThEB 8wTibEN+bRodZlml7glB0xRInSLS2pZSf2cwYNv71yE+hvLRDogmR/Nr9+mc+wCKQ9q9 RItTWdjfa4uQPZLRsxsxdppbH7rsT4+igPlZEhSJjDg8nqeLiManEemuK7/Oj1dGJFci QHWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=fPptF/2dGz/Wan4WLtji8eDcbWKccMVsa6o9HoFeN34=; b=ypsGXFQBH+OV6H91eTwCUylY9UKqUqkwz8r+MUQ29MKKU4Oa7h5deZ9hSWG/rKaRz+ TZE/EOcYHIKSSvhvZrYo3nM5tTjK6ouvIusMKY7uEqpD9uGeb1Hqsiy4w932kzNZi6bk Dt74W6T7Q8k3ypQbC0zeoLcDj8ltr8pXigavl1L4AA9xocqqxNBlqEGa6EnEzS7DA5ql vA6flh/va2Bntr6iiZqmFnWLe+/iGEZYFr4IdkLkiY/MLXs6TxO2zFrmK5CDhXiqtaTV K6DGobSzHpFYcst5oY+pFpDaRNlsEbd+U8Zq+TILL78hjq3Svs1/98LE0mDrWN+cX6Qq qAmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lwn.net header.s=20201203 header.b=liiGAhtw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w16-20020aa7cb50000000b004fcbd87bb03si414026edt.333.2023.03.30.13.05.32; Thu, 30 Mar 2023 13:05:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@lwn.net header.s=20201203 header.b=liiGAhtw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232075AbjC3T43 (ORCPT + 99 others); Thu, 30 Mar 2023 15:56:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231984AbjC3T4Z (ORCPT ); Thu, 30 Mar 2023 15:56:25 -0400 Received: from ms.lwn.net (ms.lwn.net [IPv6:2600:3c01:e000:3a1::42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ACC11027D; Thu, 30 Mar 2023 12:56:19 -0700 (PDT) Received: from meer.lwn.net (unknown [IPv6:2601:281:8300:73::5f6]) by ms.lwn.net (Postfix) with ESMTPA id E3520736; Thu, 30 Mar 2023 19:56:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 ms.lwn.net E3520736 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lwn.net; s=20201203; t=1680206179; bh=fPptF/2dGz/Wan4WLtji8eDcbWKccMVsa6o9HoFeN34=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=liiGAhtwvwx+jHQZ4PmbMD6nlDYiTXyG5CyiTKgohqsHsYfgco1yUwbm6TbEbXMfM hXcDCoyYhKkAvoHVz95VBtwUdivBUvmgm467maMjGdpaSlw5QzrhvNmCDy55MovhJH igBmSY3wQj0GTbiI6xhLXWU4rZh9hZAJVnSC9OW3vHYnElhwXbEUAt7aBAJGf+7Qp1 hm4S3RCgH9DOQRWwBwG/6PYLC/AyT4YUCa6V7j/soY3Z/pRjk7OXD+HNIAHFhytF+x CJ0Axy4wMW9FmHgnxzmmuwTOY9ecHiHzniFrIHIl4D8QJCFq9X3/tzQxbT92KfrBp4 NmQxBnpw3Fmkg== From: Jonathan Corbet To: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Jonathan Corbet , Vineet Gupta Subject: [PATCH 1/4] docs: Move arc architecture docs under Documentation/arch/ Date: Thu, 30 Mar 2023 13:56:01 -0600 Message-Id: <20230330195604.269346-2-corbet@lwn.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330195604.269346-1-corbet@lwn.net> References: <20230330195604.269346-1-corbet@lwn.net> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761824480285632584?= X-GMAIL-MSGID: =?utf-8?q?1761824480285632584?= 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 Signed-off-by: Jonathan Corbet Acked-by: Vineet Gupta --- 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 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/ From patchwork Thu Mar 30 19:56:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 77392 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp112277vqo; Thu, 30 Mar 2023 13:22:57 -0700 (PDT) X-Google-Smtp-Source: AKy350ZWMF0KHw1vZ85s8fxQFvYLavc23+1aVdHFnU2J4BBzjkc6rYciIg5k5AMKo2SWRvaBfJGY X-Received: by 2002:a17:906:5010:b0:92a:77dd:f6f with SMTP id s16-20020a170906501000b0092a77dd0f6fmr26942481ejj.73.1680207777636; Thu, 30 Mar 2023 13:22:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680207777; cv=none; d=google.com; s=arc-20160816; b=NI/WHlCFgqwWO1Sdj/ztffAGbewXT/Ub8gB8ttHaDyrvqxk6UdLzJSpsq63gAKX9wx XgeJUwQJ924GWn+1u4Ql8nJFFYSfb37m1Ca/LfkHJaGg0iCG572/0bqdmRcf88+giLbi hoCzCY6EYRtfOmTnYPl+NL6EjkttlKM8YR04ORjWJig3DEeAHS4/E68VEFcVyLzgX+Hw ZhQEIOZc4EgoyaQGW8Ij/rlBz/m7CIAC5LDtbnj1/jydgd6hBnrhxfnXnkElHlG6p+yz le3Y8062IbWjWTTl/gAbHly1lMT2nYAiTmd6hvN6C09paFX6Dbj7U56fMndFHjaxd6oU m9Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=ZWpDe74U3Fhl0J6lbM9YoaPnOlXMk5FAqeyqi/rrhfg=; b=Kb1wByVFn75F2yMQTHHVLbm9irVyAwPtHn9a6HfjPXdOX8CJ86ze0BJchAZa6Hfj2V 2lvKVAJHhHDaoaLGRcfzXLd3b03+wIrPLO5qGx0UTeqZVUIhnAMp2SM21JId5ICu+j/h fvjHzkPeJEe8u2UzzAE/AO/M0vxN6KYO8P+BNfHoy0vlShgzow2QMDvAEZJ3lSHV8Sbv hofpbW0RXGzXdXr8g/vd9GA/u0ekCXqSr4lhIJffRl5Hj9nMvZQrA58CMJvB2BMzeGPs sWPElmgETLFUlX3pQa/TfybrXQw6gfMkmIUCFY8Al9wlfKSLnBPkJpHvCDcJnihKrpq0 IlfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lwn.net header.s=20201203 header.b=tdbVMMR8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gz5-20020a170907a04500b0093a0ef38401si403739ejc.94.2023.03.30.13.22.32; Thu, 30 Mar 2023 13:22:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@lwn.net header.s=20201203 header.b=tdbVMMR8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232307AbjC3T4c (ORCPT + 99 others); Thu, 30 Mar 2023 15:56:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232001AbjC3T4Z (ORCPT ); Thu, 30 Mar 2023 15:56:25 -0400 Received: from ms.lwn.net (ms.lwn.net [IPv6:2600:3c01:e000:3a1::42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EFF710260; Thu, 30 Mar 2023 12:56:19 -0700 (PDT) Received: from meer.lwn.net (unknown [IPv6:2601:281:8300:73::5f6]) by ms.lwn.net (Postfix) with ESMTPA id 6F570733; Thu, 30 Mar 2023 19:56:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 ms.lwn.net 6F570733 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lwn.net; s=20201203; t=1680206179; bh=ZWpDe74U3Fhl0J6lbM9YoaPnOlXMk5FAqeyqi/rrhfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tdbVMMR83re5DCZYqWJmSJHGinC4Ye2YiwRzKlmgP6MI1VGGCS3FgXllTOgTD+52X 6PXnOW4TtfW41/bdiyzza8jy2e5QTLMjh8PaJ3tCQC35MJkBJTtfnL8BybQnvap26h gNwDWxdItfOe+337INrmPPk2Z6eRVYVB1JtWutEfP99aBeLZp3m2wJJDGa9SsGy49Q o0pHjdV5UXqmGIEmicgpR7xRGhAOouEBiLFF8KCKOxqjJxKw5CDeDWy3wQKhVTdlQu lHSkB+aBa66jDwlhn0cb1nH/XZ5+3nJmHqX77pm2z3OKLF2WTT5e3EhZEspNQU/NQp N05+1J1J9hR8Q== From: Jonathan Corbet To: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Jonathan Corbet Subject: [PATCH 2/4] docs: move ia64 architecture docs under Documentation/arch/ Date: Thu, 30 Mar 2023 13:56:02 -0600 Message-Id: <20230330195604.269346-3-corbet@lwn.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330195604.269346-1-corbet@lwn.net> References: <20230330195604.269346-1-corbet@lwn.net> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761825550281554906?= X-GMAIL-MSGID: =?utf-8?q?1761825550281554906?= 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 --- 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 /* - * 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)) From patchwork Thu Mar 30 19:56:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 77394 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp115672vqo; Thu, 30 Mar 2023 13:30:36 -0700 (PDT) X-Google-Smtp-Source: AKy350aeN0TMrXmFlmK6M053jnJXmKNtBWqtcFPzC5t2MBwOd0WsC+cEAR76G/Pr3kmshQRvUJBD X-Received: by 2002:a17:906:9498:b0:947:74fa:483e with SMTP id t24-20020a170906949800b0094774fa483emr2384308ejx.31.1680208236139; Thu, 30 Mar 2023 13:30:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680208236; cv=none; d=google.com; s=arc-20160816; b=ByGhRJmJZ2Rn3FTgWR7DUd4c6VDSJefkL/VjqNWWoHgn7iRKRnMP6JDLWj/8U5N4PO jH4DFXj2h0CQJtpNDPhbiignxdQ/j3h7gFvgKlrwhb0xxCIteKQlLey5jFkjP732De8d UKis8LJ0SSMJyatonw3srCPH5KTHILc6T+Rd/rQ2bUR5nGFpy1gGl/101I6UlP+uP4Ws DXNWT6DK3iKGuKCrKaeoAnnt1kCRdIH7OQdsc3loaDfm1NF4aP6AR1PHCKPValGblXAB KvUsmpbyWiWWAU1ecVFZsepMLAtVAgWmwedlpYaKAqXaO7aNVzJHX5v/3FyEy7R3Sqdl 3bFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=EtkcblHy6iVZKm3WEuaF/oTESZjrcPaB7ngZEgjiI0A=; b=P3JgurF+qZS+AKJZ3y7LGn/HboyWLxp+bgqMcIKyI34zOgXMirBQj+9pBC89oQdMcs ClkGg9HXuPxTe6YUgAzCFsKXroA+xppT+Wz78DkjUg8UYHMDbAJDykBl2UBWfwx4kE0d SqCkqIQCu7O+yArVR0jRDAptUiR+0ABmritr2dzWNOXhtvL1kOIBuFLZdWAdhpy1Kfyt Ezgq00E/xVST3EidIg2V8++tZepHMU6HO79VzVP6rtJvYEFzUxRpf1Nbj7InUecgMOQ1 OBAKY3zrwKLbjUT8FbDGAVVQllkdBMNAoBqZ6oq8asYsShES1qHjXXq+RvCiroK8MboC pbuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lwn.net header.s=20201203 header.b=QTxNdjzJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u26-20020a170906b11a00b0091883920748si352364ejy.12.2023.03.30.13.29.46; Thu, 30 Mar 2023 13:30:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@lwn.net header.s=20201203 header.b=QTxNdjzJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232326AbjC3T4f (ORCPT + 99 others); Thu, 30 Mar 2023 15:56:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232011AbjC3T40 (ORCPT ); Thu, 30 Mar 2023 15:56:26 -0400 Received: from ms.lwn.net (ms.lwn.net [IPv6:2600:3c01:e000:3a1::42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9E9710A87; Thu, 30 Mar 2023 12:56:20 -0700 (PDT) Received: from meer.lwn.net (unknown [IPv6:2601:281:8300:73::5f6]) by ms.lwn.net (Postfix) with ESMTPA id E6D137F8; Thu, 30 Mar 2023 19:56:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 ms.lwn.net E6D137F8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lwn.net; s=20201203; t=1680206180; bh=EtkcblHy6iVZKm3WEuaF/oTESZjrcPaB7ngZEgjiI0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QTxNdjzJiCLemvV+za0zGb2MMa6bzZ6GBdP5BXseUsJxmWk0jXFSy4B084GcKiFOi fFXK16GAQ3Yh0nmZ/MgQKWRjA6gseXmh2dYEqoQMjUvI1peEz1diAyyWJU1qt0fCFs XGZDFRGaRnDXIAdoyK/I9z/o+pX0hbcbDLT5SXmRHI25ijhmOwhU4aGXNDVsGZuG05 8QAthcUaHTRthlKwTGfrgpMwP9ukdGxL9mLToo6XBNsS9vMkAky+Y4yqNowLxGgpK3 LjMX9bzVLfQH7OSMpzMrLXYAmqgZfJ5mdDtg6fscTcbiZaiTmx5Y1DdN3WmSXx+nXe cDdKtKDRUpNTA== From: Jonathan Corbet To: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Jonathan Corbet , "James E.J. Bottomley" , Helge Deller , Alex Shi , Yanteng Si Subject: [PATCH 3/4] docs: move parisc documentation under Documentation/arch/ Date: Thu, 30 Mar 2023 13:56:03 -0600 Message-Id: <20230330195604.269346-4-corbet@lwn.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330195604.269346-1-corbet@lwn.net> References: <20230330195604.269346-1-corbet@lwn.net> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761826031342841393?= X-GMAIL-MSGID: =?utf-8?q?1761826031342841393?= 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" Cc: Helge Deller Cc: Alex Shi Cc: Yanteng Si Signed-off-by: Jonathan Corbet Reviewed-by: Yanteng Si --- 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 From patchwork Thu Mar 30 19:56:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 77404 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp127655vqo; Thu, 30 Mar 2023 13:57:04 -0700 (PDT) X-Google-Smtp-Source: AKy350ZKuHji7DEls8knGCWFizPkMqJA7uvKwVVvsY7zXdEInXKS+lyfyMPmpThCPxn6KFt42H0U X-Received: by 2002:a17:903:d4:b0:19a:b427:230a with SMTP id x20-20020a17090300d400b0019ab427230amr19844450plc.63.1680209823978; Thu, 30 Mar 2023 13:57:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680209823; cv=none; d=google.com; s=arc-20160816; b=mTZlR3OoHZBgmL8P0XarelM/Ro63VVtI8SzIkKFlue+ziSlFC/xz37iEVZ+aZJD0im eBmiEMJRzRmA5GlHOeko0EisXytnfIMCjjAFyjK+LgD1XV5UppEGy4hgkqDh+JYTykRE b7X10RrjY7wzXnKkkN32ICRE0BFSuu856Mi/wJ5OmciHDXzJweCD49597kMzyyT1mjX2 fTVEjAccOfXTaEugfObRps6zREW3bIBAubmea9QJw4xzZYbhGDnALpzIJG22Dg2lcmMa ACPSIlmtuejjME3qpVzjyUOmmsHd6fd20fAEFoydUta0IOOizNHTO9QTDbvpid24i1Qp 0qTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=8qKYwim6qzzDNM1Ego9KfkuJofkSbeI1sjSlRBWM9CE=; b=BQzkAaRUe0YgseEIpuyMhQyz3CA2cYFwamoYCA4on924dvfOWzYzcB3IIM/QP20FY6 /ewJgMRPusTYe14mbGDaE4cnGs4aov+zw6jw1Z3O8WH27SQch+vdYbdx9jlimj8lvjI4 odGxwORSOfaaEU+kNZm1f3uDkEla4EFLlolLzAmBU6RCgE7Rs5c1Dmfg+k2U1e/TMTeo CNJSgDxoYaRmHUdqErvhkmd4ar3d2J7O97aaP5+iRuzKL4vKSfKlDDfTAIv+gATzLr5C eRZL4AvUj3K1qThCC0qvZVYCPAkEtmYgYK+/9doEv9Qf3uw1x3J5t6fzZnjs1AMwbQxM 5C+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lwn.net header.s=20201203 header.b="f/kUoGqp"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w23-20020a1709027b9700b001a067e3b1edsi324776pll.592.2023.03.30.13.56.51; Thu, 30 Mar 2023 13:57:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@lwn.net header.s=20201203 header.b="f/kUoGqp"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232333AbjC3T4h (ORCPT + 99 others); Thu, 30 Mar 2023 15:56:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232109AbjC3T41 (ORCPT ); Thu, 30 Mar 2023 15:56:27 -0400 Received: from ms.lwn.net (ms.lwn.net [IPv6:2600:3c01:e000:3a1::42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 903B510408; Thu, 30 Mar 2023 12:56:21 -0700 (PDT) Received: from meer.lwn.net (unknown [IPv6:2601:281:8300:73::5f6]) by ms.lwn.net (Postfix) with ESMTPA id 9BBE9993; Thu, 30 Mar 2023 19:56:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 ms.lwn.net 9BBE9993 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lwn.net; s=20201203; t=1680206181; bh=8qKYwim6qzzDNM1Ego9KfkuJofkSbeI1sjSlRBWM9CE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f/kUoGqpKoyEYCz29zAodrRGvGKcUY0/n1kHOY/cYQSf4oq+nIbrrq1X+DuevahzK pZNMNQoScjO8tGcJloG2cL8Qwl9kiz2yeUMpyeQSEHP1deDhbYF465tzRpJk5ukmVA iVtd4Ets7v/e1fvDvPP28EIqaDjak5fJf3sxf5uOuH9Av+DyZZA2T0IMKA68kB0QYD UwVbhISHml+w3NUeXFmd9UY2ipbzWDOYl3sU0kRxKEw8Q1dP1qydrfZYwdtceH8101 V2Zv+4YHVOsEx+54d6CJ8Xe8WsanOXp3NfKL53A8q5Axd7vxH8kYX7yqD6aklz1gqy wfdU8TRiHlvgw== From: Jonathan Corbet To: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Jonathan Corbet , Geert Uytterhoeven Subject: [PATCH 4/4] docs: move m68k architecture documentation under Documentation/arch/ Date: Thu, 30 Mar 2023 13:56:04 -0600 Message-Id: <20230330195604.269346-5-corbet@lwn.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330195604.269346-1-corbet@lwn.net> References: <20230330195604.269346-1-corbet@lwn.net> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761827696247118837?= X-GMAIL-MSGID: =?utf-8?q?1761827696247118837?= 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 Signed-off-by: Jonathan Corbet Reviewed-by: Geert Uytterhoeven Acked-by: Geert Uytterhoeven --- 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 ; otherwise say N. + material available in ; 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 ; otherwise say N. + available in ; otherwise say N. config ATARI_KBD_CORE bool