From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEF2FE784BF for ; Mon, 2 Oct 2023 15:32:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238080AbjJBPc1 (ORCPT ); Mon, 2 Oct 2023 11:32:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237779AbjJBPc0 (ORCPT ); Mon, 2 Oct 2023 11:32:26 -0400 Received: from ms.lwn.net (ms.lwn.net [IPv6:2600:3c01:e000:3a1::42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A270AC; Mon, 2 Oct 2023 08:32:23 -0700 (PDT) Received: from localhost (unknown [IPv6:2601:281:8300:73::646]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ms.lwn.net (Postfix) with ESMTPSA id BB6B86E2; Mon, 2 Oct 2023 15:32:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 ms.lwn.net BB6B86E2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lwn.net; s=20201203; t=1696260741; bh=WKwix5ltgB/Rv47bjZiYblkMD2/CI4dSq0MKwEEmH7w=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=OwSsZDW/5ye5r388TvoSDEcESUIR+xj07++SnzEsA5gsZDHH3iMedoo+rgSmNAXqh 1RA37+x960flUtH4LLp60ZDAAAUpQhklj8Ighq0ajc6085S63fRLMo/VQYf2LWRD0u DS3qyUr4WrfZ641H8L4Gjty76PwdOXh+1ZycePTG/hOjjiqc9BEkf2xgJY1KnPJ63U 3+ToPlOlnI7X2a37oLoIOuW8QsawBQG1VBP3KIWEDzUYyDbOsWweXAoJ483CyhK/36 qTNo8tyxs4rLyqZYzRvOCiBd7GRbdYQkRF3p9XpTcWvR22uWaaCpdlUPbXCVtjIE0Z 2V/LRYh7ePROQ== From: Jonathan Corbet To: Conor Dooley Cc: Costa Shulyupin , Paul Walmsley , Palmer Dabbelt , Albert Ou , Federico Vaga , Alex Shi , Yanteng Si , Heiko Carstens , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Ard Biesheuvel , Atish Patra , Alexandre Ghiti , Randy Dunlap , =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= , Andrew Jones , Evan Green , Conor Dooley , Heiko Stuebner , Andy Chiu , Bjorn Helgaas , Greentime Hu , Anup Patel , Bagas Sanjaya , Charlie Jenkins , Vincent Chen , Wu XiangCheng , Sami Tolvanen , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, workflows@vger.kernel.org Subject: Re: [PATCH] docs: move riscv under arch In-Reply-To: <20231002-panoramic-submersed-7f5bfd8d1e76@spud> References: <20230928103134.2779459-1-costa.shul@redhat.com> <20230930-mauve-jargon-0f7760fd262d@spud> <87h6nbka8x.fsf@meer.lwn.net> <20231002-panoramic-submersed-7f5bfd8d1e76@spud> Date: Mon, 02 Oct 2023 09:32:21 -0600 Message-ID: <875y3phwfu.fsf@meer.lwn.net> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: workflows@vger.kernel.org Conor Dooley writes: > On Sat, Sep 30, 2023 at 08:26:38AM -0600, Jonathan Corbet wrote: >> Conor Dooley writes: >> >> > On Thu, Sep 28, 2023 at 01:29:42PM +0300, Costa Shulyupin wrote: >> >> and fix all in-tree references. >> >> >> >> 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. >> >> >> >> Signed-off-by: Costa Shulyupin >> > >> > This doesn't apply to riscv/for-next or next/master, with git >> > complaining about the sha1 being lacking or useless. What does this >> > actually apply to? >> >> docs-next, I would guess (though I haven't had a chance to try it). > > I'm far from the world's best git-er, but doesn't the lacking or useless > report from git while trying to apply the patches mean that this patch > depended on commit that is not in next/master (which I assume includes > docs-next). It just means there's a divergence somewhere. One tree has a patch that the other lacks, and that creates a conflict making the whole thing fail. Business as usual... jon