[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87351q1fcw.fsf@meer.lwn.net>
Date: Fri, 14 Jul 2023 13:07:43 -0600
From: Jonathan Corbet <corbet@....net>
To: Hu Haowen <src.res.211@...il.com>, siyanteng@...ngson.cn,
bobwxc@...il.cn, alexs@...nel.org, gregkh@...uxfoundation.org,
nabijaczleweli@...ijaczleweli.xyz, carlos.bilbao@....com,
me@...ui.org
Cc: Hu Haowen <src.res.211@...il.com>, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] docs/zh_TW: rewrite index.rst
Hu Haowen <src.res.211@...il.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@...il.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
Powered by blists - more mailing lists