[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <875y3phwfu.fsf@meer.lwn.net>
Date: Mon, 02 Oct 2023 09:32:21 -0600
From: Jonathan Corbet <corbet@....net>
To: Conor Dooley <conor@...nel.org>
Cc: Costa Shulyupin <costa.shul@...hat.com>,
Paul Walmsley <paul.walmsley@...ive.com>,
Palmer Dabbelt <palmer@...belt.com>,
Albert Ou <aou@...s.berkeley.edu>,
Federico Vaga <federico.vaga@...a.pv.it>,
Alex Shi <alexs@...nel.org>,
Yanteng Si <siyanteng@...ngson.cn>,
Heiko Carstens <hca@...ux.ibm.com>,
Philippe Mathieu-Daudé <philmd@...aro.org>,
Ard Biesheuvel <ardb@...nel.org>,
Atish Patra <atishp@...osinc.com>,
Alexandre Ghiti <alexghiti@...osinc.com>,
Randy Dunlap <rdunlap@...radead.org>,
Björn Töpel <bjorn@...osinc.com>,
Andrew Jones <ajones@...tanamicro.com>,
Evan Green <evan@...osinc.com>,
Conor Dooley <conor.dooley@...rochip.com>,
Heiko Stuebner <heiko@...ech.de>,
Andy Chiu <andy.chiu@...ive.com>,
Bjorn Helgaas <bhelgaas@...gle.com>,
Greentime Hu <greentime.hu@...ive.com>,
Anup Patel <anup@...infault.org>,
Bagas Sanjaya <bagasdotme@...il.com>,
Charlie Jenkins <charlie@...osinc.com>,
Vincent Chen <vincent.chen@...ive.com>,
Wu XiangCheng <bobwxc@...il.cn>,
Sami Tolvanen <samitolvanen@...gle.com>,
linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-riscv@...ts.infradead.org, workflows@...r.kernel.org
Subject: Re: [PATCH] docs: move riscv under arch
Conor Dooley <conor@...nel.org> writes:
> On Sat, Sep 30, 2023 at 08:26:38AM -0600, Jonathan Corbet wrote:
>> Conor Dooley <conor@...nel.org> 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 <costa.shul@...hat.com>
>> >
>> > 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
Powered by blists - more mailing lists