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;
From:   Jonathan Corbet <corbet@lwn.net>
To:     Hu Haowen <src.res.211@gmail.com>, siyanteng@loongson.cn,
        bobwxc@email.cn, alexs@kernel.org, gregkh@linuxfoundation.org,
        nabijaczleweli@nabijaczleweli.xyz, carlos.bilbao@amd.com,
        me@lirui.org
Cc:     Hu Haowen <src.res.211@gmail.com>, linux-doc@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] docs/zh_TW: rewrite index.rst
In-Reply-To: <20230708054052.45967-1-src.res.211@gmail.com>
References: <20230708054052.45967-1-src.res.211@gmail.com>
Date:   Fri, 14 Jul 2023 13:07:43 -0600
Message-ID: <87351q1fcw.fsf@meer.lwn.net>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Hu Haowen <src.res.211@gmail.com> writes:

> Update zh_TW's index.rst to the version of commit 0c7b4366f1ab ("docs:
> Rewrite the front page") with some reference from commit f4bf1cd4ac9c
> ("docs: move asm-annotations.rst into core-api") and commit eef24f7054a6
> ("docs/zh_CN: Rewrite the Chinese translation front page").
>
> Signed-off-by: Hu Haowen <src.res.211@gmail.com>
> ---
>  Documentation/translations/zh_TW/index.rst | 156 ++++++++-------------
>  1 file changed, 56 insertions(+), 100 deletions(-)

So your two patches conflict with each other.  I've sorted it out and
applied this, but it would be nicer if I didn't have to do that...

Thanks,

jon